diff --git a/demos/demos.pro b/demos/demos.pro index eebabf8..4f7390f 100644 --- a/demos/demos.pro +++ b/demos/demos.pro @@ -1,5 +1,4 @@ TEMPLATE = subdirs SUBDIRS += chartthemes \ piechartcustomization \ - gdpbarchart \ qmlchart diff --git a/src/areachart/qareaseries.cpp b/src/areachart/qareaseries.cpp index 82ac740..142b3f3 100644 --- a/src/areachart/qareaseries.cpp +++ b/src/areachart/qareaseries.cpp @@ -90,7 +90,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE */ /*! - \fn void QAreaSeries::updated() + \fn void QAreaSeriesPrivate::updated() \brief \internal */ diff --git a/src/barchart/qbarset.cpp b/src/barchart/qbarset.cpp index 816961c..64f71a1 100644 --- a/src/barchart/qbarset.cpp +++ b/src/barchart/qbarset.cpp @@ -56,7 +56,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE */ /*! - \fn void QBarSet::showToolTip(QPoint pos, QString tip) + \fn void QBarSetPrivate::showToolTip(QPoint pos, QString tip) \brief \internal \a pos \a tip */ diff --git a/src/qseries.cpp b/src/qseries.cpp index a88a894..a32aa1c 100644 --- a/src/qseries.cpp +++ b/src/qseries.cpp @@ -81,7 +81,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE */ /*! - \fn void QSeries::setName(QString name) + \fn void QSeries::setName(const QString& name) \brief Sets a \a name for the series. The name of a series is shown in the legend for QXYSeries. diff --git a/src/xychart/qxyseries.cpp b/src/xychart/qxyseries.cpp index 9272468..9b68799 100644 --- a/src/xychart/qxyseries.cpp +++ b/src/xychart/qxyseries.cpp @@ -47,22 +47,22 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE */ /*! - \fn void QXYSeries::pointReplaced(int index) + \fn void QXYSeriesPrivate::pointReplaced(int index) \brief \internal \a index */ /*! - \fn void QXYSeries::pointAdded(int index) + \fn void QXYSeriesPrivate::pointAdded(int index) \brief \internal \a index */ /*! - \fn void QXYSeries::pointRemoved(int index) + \fn void QXYSeriesPrivate::pointRemoved(int index) \brief \internal \a index */ /*! - \fn void QXYSeries::updated() + \fn void QXYSeriesPrivate::updated() \brief \internal */ diff --git a/demos/gdpbarchart/gdpData b/test/gdpbarchart/gdpData similarity index 100% rename from demos/gdpbarchart/gdpData rename to test/gdpbarchart/gdpData Binary files a/demos/gdpbarchart/gdpData and b/test/gdpbarchart/gdpData differ diff --git a/demos/gdpbarchart/gdpbarchart.pro b/test/gdpbarchart/gdpbarchart.pro similarity index 84% rename from demos/gdpbarchart/gdpbarchart.pro rename to test/gdpbarchart/gdpbarchart.pro index 54fd262..21b04dc 100644 --- a/demos/gdpbarchart/gdpbarchart.pro +++ b/test/gdpbarchart/gdpbarchart.pro @@ -1,4 +1,6 @@ -!include( ../demos.pri ):error( "Couldn't find the demos.pri file!" ) +!include( ../test.pri ) { + error( "Couldn't find the test.pri file!" ) +} QT+= sql TARGET = gdpbarchart diff --git a/demos/gdpbarchart/main.cpp b/test/gdpbarchart/main.cpp similarity index 100% rename from demos/gdpbarchart/main.cpp rename to test/gdpbarchart/main.cpp diff --git a/demos/gdpbarchart/widget.cpp b/test/gdpbarchart/widget.cpp similarity index 100% rename from demos/gdpbarchart/widget.cpp rename to test/gdpbarchart/widget.cpp diff --git a/demos/gdpbarchart/widget.h b/test/gdpbarchart/widget.h similarity index 100% rename from demos/gdpbarchart/widget.h rename to test/gdpbarchart/widget.h diff --git a/test/test.pro b/test/test.pro index a4486af..e7efab5 100644 --- a/test/test.pro +++ b/test/test.pro @@ -1,7 +1,8 @@ TEMPLATE = subdirs SUBDIRS += \ chartwidgettest \ - wavechart + wavechart \ + gdpbarchart !win32:{ SUBDIRS += auto