From 214b6c6d3a2b1746071db69125777e4e6c941c12 2013-11-01 05:12:12 From: Titta Heikkala Date: 2013-11-01 05:12:12 Subject: [PATCH] Fix documentation paths The paths for qdocinc files and for images has been fixed so that creating the documentation works also for Mac. Task-number: QTRD-2492 Change-Id: Ibfefd06dfb4d85bbdb10b400aadda204ad50c21a Reviewed-by: Mika Salmela --- diff --git a/doc/docconf/qcharts-qt4.qdocconf b/doc/docconf/qcharts-qt4.qdocconf index 6df07fd..a819a0c 100644 --- a/doc/docconf/qcharts-qt4.qdocconf +++ b/doc/docconf/qcharts-qt4.qdocconf @@ -4,6 +4,4 @@ include(qchart-html-template.qdocconf) include(qchart-qch.qdocconf) include(qcharts.qdocconf) -outputdir = ../html -imagedirs = ../images sourcedirs += ../src_qt4 diff --git a/doc/docconf/qcharts-qt5.qdocconf b/doc/docconf/qcharts-qt5.qdocconf index 5c1fe53..33c6836 100644 --- a/doc/docconf/qcharts-qt5.qdocconf +++ b/doc/docconf/qcharts-qt5.qdocconf @@ -4,6 +4,12 @@ include(qchart-qch.qdocconf) include(qcharts.qdocconf) defines = QDOC_QT5 -outputdir = ../html -imagedirs = ../../images +sourcedirs += ../../ + +#excludedirs for Windows and Linux excludedirs += ../src_qt4 +#excludefiles for Mac +excludefiles += ../src_qt4/demos.qdoc \ + ../src_qt4/examples.qdoc \ + ../src_qt4/index.qdoc \ + ../src_qt4/qml.qdoc diff --git a/doc/docconf/qcharts.qdocconf b/doc/docconf/qcharts.qdocconf index 55185ce..520301d 100644 --- a/doc/docconf/qcharts.qdocconf +++ b/doc/docconf/qcharts.qdocconf @@ -14,6 +14,9 @@ exampledirs = ../../ \ ../../src \ ../../examples +outputdir = ../html +imagedirs = ../images + sources.fileextensions = *.cpp *.qdoc *.mm *.qml *.qdocinc headers.fileextensions = *.h *.ch *.h++ *.hh *.hpp *.hxx examples.fileextensions = *.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp *.qml diff --git a/plugins/declarative/declarativeboxplotseries.cpp b/plugins/declarative/declarativeboxplotseries.cpp index 42cd639..9ff3af7 100644 --- a/plugins/declarative/declarativeboxplotseries.cpp +++ b/plugins/declarative/declarativeboxplotseries.cpp @@ -31,7 +31,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE \instantiates QBoxSet \inqmlmodule QtCommercial.Chart - \include /doc/src/declarativeboxset.qdocinc + \include doc/src/declarativeboxset.qdocinc */ #else /*! @@ -106,7 +106,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE \instantiates QBoxPlotSeries \inqmlmodule QtCommercial.Chart - \include /doc/src/declarativeboxplotseries.qdocinc + \include doc/src/declarativeboxplotseries.qdocinc */ #else /*! diff --git a/plugins/declarative/declarativecategoryaxis.cpp b/plugins/declarative/declarativecategoryaxis.cpp index dad88cc..08a8886 100644 --- a/plugins/declarative/declarativecategoryaxis.cpp +++ b/plugins/declarative/declarativecategoryaxis.cpp @@ -28,7 +28,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE \qmltype CategoryRange \inqmlmodule QtCommercial.Chart - \include /doc/src/categoryrange.qdocinc + \include doc/src/categoryrange.qdocinc */ #else /*! diff --git a/plugins/declarative/declarativechart.cpp b/plugins/declarative/declarativechart.cpp index 8364f0e..4cc1119 100644 --- a/plugins/declarative/declarativechart.cpp +++ b/plugins/declarative/declarativechart.cpp @@ -58,7 +58,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE \instantiates DeclarativeChart \inqmlmodule QtCommercial.Chart - \include /doc/src/chartview.qdocinc + \include doc/src/chartview.qdocinc */ #else /*! diff --git a/plugins/declarative/declarativemargins.cpp b/plugins/declarative/declarativemargins.cpp index 35fc9e8..e33dd77 100644 --- a/plugins/declarative/declarativemargins.cpp +++ b/plugins/declarative/declarativemargins.cpp @@ -29,7 +29,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE \qmltype Margins \inqmlmodule QtCommercial.Chart - \include /doc/src/margins.qdocinc + \include doc/src/margins.qdocinc */ #else /*! diff --git a/plugins/declarative/declarativepolarchart.cpp b/plugins/declarative/declarativepolarchart.cpp index 86bd2a1..5e0994d 100644 --- a/plugins/declarative/declarativepolarchart.cpp +++ b/plugins/declarative/declarativepolarchart.cpp @@ -29,7 +29,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE \instantiates DeclarativePolarChart \inqmlmodule QtCommercial.Chart - \include /doc/src/declarativepolarchart.qdocinc + \include doc/src/declarativepolarchart.qdocinc */ #else /*! diff --git a/plugins/declarative/declarativexypoint.cpp b/plugins/declarative/declarativexypoint.cpp index d4f96a4..ddcae48 100644 --- a/plugins/declarative/declarativexypoint.cpp +++ b/plugins/declarative/declarativexypoint.cpp @@ -28,7 +28,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE \qmltype XYPoint \inqmlmodule QtCommercial.Chart - \include /doc/src/declarativexypoint.qdocinc + \include doc/src/declarativexypoint.qdocinc */ #else /*! diff --git a/src/areachart/qareaseries.cpp b/src/areachart/qareaseries.cpp index c1a05f1..ffcf697 100644 --- a/src/areachart/qareaseries.cpp +++ b/src/areachart/qareaseries.cpp @@ -53,7 +53,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE \instantiates QAreaSeries \inqmlmodule QtCommercial.Chart - \include /doc/src/areaseries.qdocinc + \include doc/src/areaseries.qdocinc */ #else /*! diff --git a/src/axis/barcategoryaxis/qbarcategoryaxis.cpp b/src/axis/barcategoryaxis/qbarcategoryaxis.cpp index 364741f..c33e6c6 100644 --- a/src/axis/barcategoryaxis/qbarcategoryaxis.cpp +++ b/src/axis/barcategoryaxis/qbarcategoryaxis.cpp @@ -60,7 +60,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE \instantiates QBarCategoryAxis \inqmlmodule QtCommercial.Chart - \include /doc/src/barcategoryaxis.qdocinc + \include doc/src/barcategoryaxis.qdocinc */ #else /*! diff --git a/src/axis/categoryaxis/qcategoryaxis.cpp b/src/axis/categoryaxis/qcategoryaxis.cpp index 8c84831..1c0e0af 100644 --- a/src/axis/categoryaxis/qcategoryaxis.cpp +++ b/src/axis/categoryaxis/qcategoryaxis.cpp @@ -68,7 +68,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE \instantiates QCategoryAxis \inqmlmodule QtCommercial.Chart - \include /doc/src/categoryaxis.qdocinc + \include doc/src/categoryaxis.qdocinc */ #else /*! diff --git a/src/axis/datetimeaxis/qdatetimeaxis.cpp b/src/axis/datetimeaxis/qdatetimeaxis.cpp index 3947344..be02a10 100644 --- a/src/axis/datetimeaxis/qdatetimeaxis.cpp +++ b/src/axis/datetimeaxis/qdatetimeaxis.cpp @@ -80,7 +80,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE \instantiates QDateTimeAxis \inqmlmodule QtCommercial.Chart - \include /doc/src/datetimeaxis.qdocinc + \include doc/src/datetimeaxis.qdocinc */ #else /*! diff --git a/src/axis/logvalueaxis/qlogvalueaxis.cpp b/src/axis/logvalueaxis/qlogvalueaxis.cpp index 683f44f..7793eb4 100644 --- a/src/axis/logvalueaxis/qlogvalueaxis.cpp +++ b/src/axis/logvalueaxis/qlogvalueaxis.cpp @@ -47,7 +47,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE \instantiates QLogValueAxis \inqmlmodule QtCommercial.Chart - \include /doc/src/logvalueaxis.qdocinc + \include doc/src/logvalueaxis.qdocinc */ #else /*! diff --git a/src/axis/qabstractaxis.cpp b/src/axis/qabstractaxis.cpp index fd0c733..b01c4e8 100644 --- a/src/axis/qabstractaxis.cpp +++ b/src/axis/qabstractaxis.cpp @@ -45,7 +45,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE \instantiates QAbstractAxis \inqmlmodule QtCommercial.Chart - \include /doc/src/abstractaxis.qdocinc + \include doc/src/abstractaxis.qdocinc */ #else /*! diff --git a/src/axis/valueaxis/qvalueaxis.cpp b/src/axis/valueaxis/qvalueaxis.cpp index c3d470d..11693c6 100644 --- a/src/axis/valueaxis/qvalueaxis.cpp +++ b/src/axis/valueaxis/qvalueaxis.cpp @@ -60,7 +60,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE \instantiates QValueAxis \inqmlmodule QtCommercial.Chart - \include /doc/src/valueaxis.qdocinc + \include doc/src/valueaxis.qdocinc */ #else /*! diff --git a/src/barchart/horizontal/bar/qhorizontalbarseries.cpp b/src/barchart/horizontal/bar/qhorizontalbarseries.cpp index c67b3ef..dae4323 100644 --- a/src/barchart/horizontal/bar/qhorizontalbarseries.cpp +++ b/src/barchart/horizontal/bar/qhorizontalbarseries.cpp @@ -50,7 +50,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE \instantiates QHorizontalBarSeries \inqmlmodule QtCommercial.Chart - \include /doc/src/horizontalbarseries.qdocinc + \include doc/src/horizontalbarseries.qdocinc */ #else /*! diff --git a/src/barchart/horizontal/percent/qhorizontalpercentbarseries.cpp b/src/barchart/horizontal/percent/qhorizontalpercentbarseries.cpp index 624e627..6a74934 100644 --- a/src/barchart/horizontal/percent/qhorizontalpercentbarseries.cpp +++ b/src/barchart/horizontal/percent/qhorizontalpercentbarseries.cpp @@ -47,7 +47,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE \instantiates QHorizontalPercentBarSeries \inqmlmodule QtCommercial.Chart - \include /doc/src/horizontalpercentbarseries.qdocinc + \include doc/src/horizontalpercentbarseries.qdocinc */ #else /*! diff --git a/src/barchart/horizontal/stacked/qhorizontalstackedbarseries.cpp b/src/barchart/horizontal/stacked/qhorizontalstackedbarseries.cpp index 102a9cb..0c1e89b 100644 --- a/src/barchart/horizontal/stacked/qhorizontalstackedbarseries.cpp +++ b/src/barchart/horizontal/stacked/qhorizontalstackedbarseries.cpp @@ -46,7 +46,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE \instantiates QHorizontalStackedBarSeries \inqmlmodule QtCommercial.Chart - \include /doc/src/horizontalstackedbarseries.qdocinc + \include doc/src/horizontalstackedbarseries.qdocinc */ #else /*! diff --git a/src/barchart/qabstractbarseries.cpp b/src/barchart/qabstractbarseries.cpp index 01d9dbc..7b89924 100644 --- a/src/barchart/qabstractbarseries.cpp +++ b/src/barchart/qabstractbarseries.cpp @@ -56,7 +56,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE \instantiates QAbstractBarSeries \inqmlmodule QtCommercial.Chart - \include /doc/src/abstractbarseries.qdocinc + \include doc/src/abstractbarseries.qdocinc */ #else /*! diff --git a/src/barchart/qbarset.cpp b/src/barchart/qbarset.cpp index 977c07b..fce6f80 100644 --- a/src/barchart/qbarset.cpp +++ b/src/barchart/qbarset.cpp @@ -45,7 +45,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE \instantiates QBarSet \inqmlmodule QtCommercial.Chart - \include /doc/src/barset.qdocinc + \include doc/src/barset.qdocinc */ #else /*! diff --git a/src/barchart/qhbarmodelmapper.cpp b/src/barchart/qhbarmodelmapper.cpp index 7d1cdbb..d6ebc06 100644 --- a/src/barchart/qhbarmodelmapper.cpp +++ b/src/barchart/qhbarmodelmapper.cpp @@ -40,7 +40,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE \instantiates QHBarModelMapper \inqmlmodule QtCommercial.Chart - \include /doc/src/hbarmodelmapper.qdocinc + \include doc/src/hbarmodelmapper.qdocinc */ #else /*! diff --git a/src/barchart/qvbarmodelmapper.cpp b/src/barchart/qvbarmodelmapper.cpp index 43fd61e..c348d87 100644 --- a/src/barchart/qvbarmodelmapper.cpp +++ b/src/barchart/qvbarmodelmapper.cpp @@ -40,7 +40,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE \instantiates QVBarModelMapper \inqmlmodule QtCommercial.Chart - \include /doc/src/vbarmodelmapper.qdocinc + \include doc/src/vbarmodelmapper.qdocinc */ #else /*! diff --git a/src/barchart/vertical/bar/qbarseries.cpp b/src/barchart/vertical/bar/qbarseries.cpp index 1b9aef7..930200a 100644 --- a/src/barchart/vertical/bar/qbarseries.cpp +++ b/src/barchart/vertical/bar/qbarseries.cpp @@ -49,7 +49,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE \instantiates QBarSeries \inqmlmodule QtCommercial.Chart - \include /doc/src/barseries.qdocinc + \include doc/src/barseries.qdocinc */ #else /*! diff --git a/src/barchart/vertical/percent/qpercentbarseries.cpp b/src/barchart/vertical/percent/qpercentbarseries.cpp index 18aa52c..2d51767 100644 --- a/src/barchart/vertical/percent/qpercentbarseries.cpp +++ b/src/barchart/vertical/percent/qpercentbarseries.cpp @@ -48,7 +48,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE \instantiates QPercentBarSeries \inqmlmodule QtCommercial.Chart - \include /doc/src/persentbarseries.qdocinc + \include doc/src/persentbarseries.qdocinc */ #else /*! diff --git a/src/barchart/vertical/stacked/qstackedbarseries.cpp b/src/barchart/vertical/stacked/qstackedbarseries.cpp index a5a16ea..c241c3d 100644 --- a/src/barchart/vertical/stacked/qstackedbarseries.cpp +++ b/src/barchart/vertical/stacked/qstackedbarseries.cpp @@ -49,7 +49,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE \instantiates QStackedBarSeries \inqmlmodule QtCommercial.Chart - \include /doc/src/stackedbarseries.qdocinc + \include doc/src/stackedbarseries.qdocinc */ #else /*! diff --git a/src/boxplotchart/qvboxplotmodelmapper.cpp b/src/boxplotchart/qvboxplotmodelmapper.cpp index 469f827..bedc02a 100644 --- a/src/boxplotchart/qvboxplotmodelmapper.cpp +++ b/src/boxplotchart/qvboxplotmodelmapper.cpp @@ -39,7 +39,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE \instantiates QVBoxPlotModelMapper \inqmlmodule QtCommercial.Chart - \include /doc/src/vboxplotmodelmapper.qdocinc + \include doc/src/vboxplotmodelmapper.qdocinc */ #else /*! diff --git a/src/legend/qlegend.cpp b/src/legend/qlegend.cpp index cbdf05b..a8c12f5 100644 --- a/src/legend/qlegend.cpp +++ b/src/legend/qlegend.cpp @@ -57,7 +57,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE \instantiates QLegend \inqmlmodule QtCommercial.Chart - \include /doc/src/legend.qdocinc + \include doc/src/legend.qdocinc */ #else /*! diff --git a/src/linechart/qlineseries.cpp b/src/linechart/qlineseries.cpp index ef8c3b7..2dfbc68 100644 --- a/src/linechart/qlineseries.cpp +++ b/src/linechart/qlineseries.cpp @@ -53,7 +53,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE \instantiates QLineSeries \inqmlmodule QtCommercial.Chart - \include /doc/src/lineseries.qdocinc + \include doc/src/lineseries.qdocinc */ #else /*! diff --git a/src/piechart/qhpiemodelmapper.cpp b/src/piechart/qhpiemodelmapper.cpp index 1cf6558..8ba1472 100644 --- a/src/piechart/qhpiemodelmapper.cpp +++ b/src/piechart/qhpiemodelmapper.cpp @@ -38,7 +38,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE \instantiates QHPieModelMapper \inqmlmodule QtCommercial.Chart - \include /doc/src/hpiemodelmapper.qdocinc + \include doc/src/hpiemodelmapper.qdocinc */ #else /*! diff --git a/src/piechart/qpieseries.cpp b/src/piechart/qpieseries.cpp index 08a17e3..4648747 100644 --- a/src/piechart/qpieseries.cpp +++ b/src/piechart/qpieseries.cpp @@ -62,7 +62,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE \instantiates QPieSeries \inqmlmodule QtCommercial.Chart - \include /doc/src/pieseries.qdocinc + \include doc/src/pieseries.qdocinc */ #else /*! diff --git a/src/piechart/qpieslice.cpp b/src/piechart/qpieslice.cpp index 2aaa900..a40658d 100644 --- a/src/piechart/qpieslice.cpp +++ b/src/piechart/qpieslice.cpp @@ -45,7 +45,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE \instantiates QPieSlice \inqmlmodule QtCommercial.Chart - \include /doc/src/pieslice.qdocinc + \include doc/src/pieslice.qdocinc */ #else /*! diff --git a/src/piechart/qvpiemodelmapper.cpp b/src/piechart/qvpiemodelmapper.cpp index c733407..fa54b1a 100644 --- a/src/piechart/qvpiemodelmapper.cpp +++ b/src/piechart/qvpiemodelmapper.cpp @@ -38,7 +38,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE \instantiates QVPieModelMapper \inqmlmodule QtCommercial.Chart - \include /doc/src/vpiemodelmapper.qdocinc + \include doc/src/vpiemodelmapper.qdocinc */ #else /*! diff --git a/src/qabstractseries.cpp b/src/qabstractseries.cpp index 5a8bbac..15fe256 100644 --- a/src/qabstractseries.cpp +++ b/src/qabstractseries.cpp @@ -47,7 +47,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE \instantiates QAbstractSeries \inqmlmodule QtCommercial.Chart - \include /doc/src/abstractseries.qdocinc + \include doc/src/abstractseries.qdocinc */ #else /*! diff --git a/src/scatterchart/qscatterseries.cpp b/src/scatterchart/qscatterseries.cpp index 28133bf..584d0b1 100644 --- a/src/scatterchart/qscatterseries.cpp +++ b/src/scatterchart/qscatterseries.cpp @@ -53,7 +53,7 @@ \instantiates QScatterSeries \inqmlmodule QtCommercial.Chart - \include /doc/src/scatterseries.qdocinc + \include doc/src/scatterseries.qdocinc */ #else /*! diff --git a/src/splinechart/qsplineseries.cpp b/src/splinechart/qsplineseries.cpp index ccde385..3a644e4 100644 --- a/src/splinechart/qsplineseries.cpp +++ b/src/splinechart/qsplineseries.cpp @@ -51,7 +51,7 @@ \instantiates QSplineSeries \inqmlmodule QtCommercial.Chart - \include /doc/src/splineseries.qdocinc + \include doc/src/splineseries.qdocinc */ #else /*! diff --git a/src/xychart/qhxymodelmapper.cpp b/src/xychart/qhxymodelmapper.cpp index ed06663..3ce9e65 100644 --- a/src/xychart/qhxymodelmapper.cpp +++ b/src/xychart/qhxymodelmapper.cpp @@ -38,7 +38,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE \instantiates QHXYModelMapper \inqmlmodule QtCommercial.Chart - \include /doc/src/hxymodelmapper.qdocinc + \include doc/src/hxymodelmapper.qdocinc */ #else /*! diff --git a/src/xychart/qvxymodelmapper.cpp b/src/xychart/qvxymodelmapper.cpp index e21522f..f7a87fc 100644 --- a/src/xychart/qvxymodelmapper.cpp +++ b/src/xychart/qvxymodelmapper.cpp @@ -38,7 +38,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE \instantiates QVXYModelMapper \inqmlmodule QtCommercial.Chart - \include /doc/src/vxymodelmapper.qdocinc + \include doc/src/vxymodelmapper.qdocinc */ #else /*! diff --git a/src/xychart/qxyseries.cpp b/src/xychart/qxyseries.cpp index c39c655..c79c4ad 100644 --- a/src/xychart/qxyseries.cpp +++ b/src/xychart/qxyseries.cpp @@ -40,7 +40,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE \instantiates QXYSeries \inqmlmodule QtCommercial.Chart - \include /doc/src/xyseries.qdocinc + \include doc/src/xyseries.qdocinc */ #else /*!