charts: Follow Qt's already-existent -developer-build option.

This means that rebuilding the entirety of Qt with -developer-build will get us
all autotests.

Furthermore, it fixes the situation on OS X where a debug_and_release build
wouldn't actually fully link.

In addition, we clean up the tests that were stubbed when internals aren't
available to just not build/run them at all by checking private_tests.

Change-Id: I5701559cd91df842f78346d7d6ad9295bee587d0
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>

4 files changed, 5 insertions, 51 deletions

diff --git a/tests/auto/auto.pri b/tests/auto/auto.pri
index 9d3ed05a..a04f5b23 100644
--- a/tests/auto/auto.pri
+++ b/tests/auto/auto.pri
@@ -8,8 +8,3 @@ QT += testlib widgets
 
 INCLUDEPATH += ../inc
 HEADERS += ../inc/tst_definitions.h
-
-#Define for unit tests
-CONFIG(debug, debug|release) {
-    DEFINES += BUILD_PRIVATE_UNIT_TESTS
-}
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index b9da92b8..7ed84cbf 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -34,3 +34,8 @@ qtHaveModule(quick) {
     SUBDIRS += qml \
                qml-qtquicktest
 }
+
+!contains(QT_CONFIG, private_tests): SUBDIRS -= \
+    domain \
+    chartdataset
+
diff --git a/tests/auto/chartdataset/tst_chartdataset.cpp b/tests/auto/chartdataset/tst_chartdataset.cpp
index ac6658fe..12652d69 100644
--- a/tests/auto/chartdataset/tst_chartdataset.cpp
+++ b/tests/auto/chartdataset/tst_chartdataset.cpp
@@ -26,27 +26,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#ifndef BUILD_PRIVATE_UNIT_TESTS
-#include <QtTest/QtTest>
-
-class tst_ChartDataSet: public QObject {
-
-    Q_OBJECT
-
-private Q_SLOTS:
-    void skip();
-
-};
-
-void tst_ChartDataSet::skip()
-{
-    QSKIP("This test requires the debug version of library");
-}
-
-QTEST_MAIN(tst_ChartDataSet)
-#include "tst_chartdataset.moc"
-
-#else
 
 #include <QtTest/QtTest>
 #include <QtCharts/QAbstractAxis>
@@ -404,4 +383,3 @@ void tst_ChartDataSet::detachAxis()
 
 QTEST_MAIN(tst_ChartDataSet)
 #include "tst_chartdataset.moc"
-#endif
diff --git a/tests/auto/domain/tst_domain.cpp b/tests/auto/domain/tst_domain.cpp
index 0b67c98e..44497940 100644
--- a/tests/auto/domain/tst_domain.cpp
+++ b/tests/auto/domain/tst_domain.cpp
@@ -26,29 +26,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#ifndef BUILD_PRIVATE_UNIT_TESTS
-
-#include <QtTest/QtTest>
-
-class tst_Domain: public QObject {
-
-    Q_OBJECT
-
-private Q_SLOTS:
-    void skip();
-
-};
-
-void tst_Domain::skip()
-{
-    QSKIP("This test requires the debug version of library");
-}
-
-QTEST_MAIN(tst_Domain)
-#include "tst_domain.moc"
-
-#else
-
 #include <QtTest/QtTest>
 #include <private/xydomain_p.h>
 #include <private/qabstractaxis_p.h>
@@ -753,4 +730,3 @@ void tst_Domain::move()
 
 QTEST_MAIN(tst_Domain)
 #include "tst_domain.moc"
-#endif