Disable private unit tests when Qt is configured without

-developer-build, part 2.

Some autotests use private (unexported) code, either because they're
testing private classes or because that's the easiest way to test
the public classes.  Configuring Qt with `-developer-build' is needed
for these tests.

This commit fixes the tests so configuring without `-developer-build'
only builds the tests which strictly use public API.

32 files changed, 108 insertions, 69 deletions

diff --git a/tests/auto/qcombobox/tst_qcombobox.cpp b/tests/auto/qcombobox/tst_qcombobox.cpp
index c94ace0..67c9ac9 100644
--- a/tests/auto/qcombobox/tst_qcombobox.cpp
+++ b/tests/auto/qcombobox/tst_qcombobox.cpp
@@ -1973,6 +1973,7 @@ void tst_QComboBox::task190351_layout()
     listCombo.showPopup();
     QTest::qWait(100);
 
+#ifdef QT_BUILD_INTERNAL
     QFrame *container = qFindChild<QComboBoxPrivateContainer *>(&listCombo);
     QVERIFY(container);
     QCOMPARE(static_cast<QAbstractItemView *>(list), qFindChild<QAbstractItemView *>(container));
@@ -1980,6 +1981,7 @@ void tst_QComboBox::task190351_layout()
     QVERIFY(top);
     QVERIFY(top->isVisible());
     QCOMPARE(top->mapToGlobal(QPoint(0, top->height())).y(), list->mapToGlobal(QPoint()).y());
+#endif
 
     QApplication::setStyle(oldStyle);
 #else
@@ -2045,6 +2047,7 @@ void tst_QComboBox::task191329_size()
     tableCombo.showPopup();
     QTest::qWait(100);
 
+#ifdef QT_BUILD_INTERNAL
     QFrame *container = qFindChild<QComboBoxPrivateContainer *>(&tableCombo);
     QVERIFY(container);
     QCOMPARE(static_cast<QAbstractItemView *>(table), qFindChild<QAbstractItemView *>(container));
@@ -2052,6 +2055,7 @@ void tst_QComboBox::task191329_size()
         //the popup should be large enough to contains everithing so the top and left button are hidden
         QVERIFY(!button->isVisible());
     }
+#endif
 
     QApplication::setStyle(oldStyle);
 #else
@@ -2107,9 +2111,11 @@ void tst_QComboBox::task248169_popupWithMinimalSize()
     comboBox.showPopup();
     QTest::qWait(100);
 
+#ifdef QT_BUILD_INTERNAL
     QFrame *container = qFindChild<QComboBoxPrivateContainer *>(&comboBox);
     QVERIFY(container);
     QVERIFY(desktop.screenGeometry(container).contains(container->geometry()));
+#endif
 }
 
 void tst_QComboBox::task247863_keyBoardSelection()
diff --git a/tests/auto/qcssparser/qcssparser.pro b/tests/auto/qcssparser/qcssparser.pro
index 57d6804..723e4d3 100644
--- a/tests/auto/qcssparser/qcssparser.pro
+++ b/tests/auto/qcssparser/qcssparser.pro
@@ -3,6 +3,7 @@ SOURCES += tst_cssparser.cpp
 DEFINES += SRCDIR=\\\"$$PWD\\\"
 QT += xml
 
+requires(contains(QT_CONFIG,private_tests))
 
 wince*: {
    addFiles.sources = testdata
diff --git a/tests/auto/qfiledialog/tst_qfiledialog.cpp b/tests/auto/qfiledialog/tst_qfiledialog.cpp
index e4fec1d..8bb81e7 100644
--- a/tests/auto/qfiledialog/tst_qfiledialog.cpp
+++ b/tests/auto/qfiledialog/tst_qfiledialog.cpp
@@ -231,6 +231,7 @@ void tst_QFiledialog::currentChangedSignal()
 // only emited from the views, sidebar, or lookin combo
 void tst_QFiledialog::directoryEnteredSignal()
 {
+#if defined QT_BUILD_INTERNAL
     QNonNativeFileDialog fd(0, "", QDir::root().path());
     fd.setOptions(QFileDialog::DontUseNativeDialog);
     fd.show();
@@ -274,6 +275,7 @@ void tst_QFiledialog::directoryEnteredSignal()
     QTest::mouseDClick(listView->viewport(), Qt::LeftButton, 0, listView->visualRect(folder).center());
     QTRY_COMPARE(spyDirectoryEntered.count(), 1);
     */
+#endif
 }
 
 Q_DECLARE_METATYPE(QFileDialog::FileMode)
@@ -1314,16 +1316,14 @@ void tst_QFiledialog::hooks()
 
 void tst_QFiledialog::listRoot()
 {
+#if defined QT_BUILD_INTERNAL
     QFileInfoGatherer::fetchedRoot = false;
     QString dir(QDir::currentPath());
     QNonNativeFileDialog fd(0, QString(), dir);
     fd.show();
-#if defined Q_AUTOTEST_EXPORT
     QCOMPARE(QFileInfoGatherer::fetchedRoot,false);
-#endif
     fd.setDirectory("");
     QTest::qWait(500);
-#if defined Q_AUTOTEST_EXPORT
     QCOMPARE(QFileInfoGatherer::fetchedRoot,true);
 #endif
 }
@@ -1347,6 +1347,7 @@ struct FriendlyQFileDialog : public QFileDialog
 
 void tst_QFiledialog::deleteDirAndFiles()
 {
+#if defined QT_BUILD_INTERNAL
     QString tempPath = QDir::tempPath() + '/' + "QFileDialogTestDir4FullDelete";
     QDir dir;
     QVERIFY(dir.mkpath(tempPath + "/foo"));
@@ -1373,6 +1374,7 @@ void tst_QFiledialog::deleteDirAndFiles()
     QFileInfo info(tempPath);
     QTest::qWait(2000);
     QVERIFY(!info.exists());
+#endif
 }
 
 void tst_QFiledialog::filter()
@@ -1583,6 +1585,7 @@ QString &dir, const QString &filter)
 
 void tst_QFiledialog::task227304_proxyOnFileDialog()
 {
+#if defined QT_BUILD_INTERNAL
     QNonNativeFileDialog fd(0, "", QDir::currentPath(), 0);
     fd.setProxyModel(new FilterDirModel(QDir::currentPath()));
     fd.show();
@@ -1616,6 +1619,7 @@ void tst_QFiledialog::task227304_proxyOnFileDialog()
     QTest::mouseClick(sidebar->viewport(), Qt::LeftButton, 0, sidebar->visualRect(sidebar->model()->index(1, 0)).center());
     QTest::qWait(250);
     //We shouldn't crash
+#endif
 }
 
 void tst_QFiledialog::task227930_correctNavigationKeyboardBehavior()
@@ -1727,6 +1731,7 @@ void tst_QFiledialog::task235069_hideOnEscape()
 
 void tst_QFiledialog::task236402_dontWatchDeletedDir()
 {
+#if defined QT_BUILD_INTERNAL
     //THIS TEST SHOULD NOT DISPLAY WARNINGS
     QDir current = QDir::currentPath();
     //make sure it is the first on the list
@@ -1746,6 +1751,7 @@ void tst_QFiledialog::task236402_dontWatchDeletedDir()
     QTest::qWait(200);
     fd.d_func()->removeDirectory(current.absolutePath() + "/aaaaaaaaaa/");
     QTest::qWait(1000);
+#endif
 }
 
 void tst_QFiledialog::task203703_returnProperSeparator()
@@ -1870,6 +1876,7 @@ void tst_QFiledialog::task218353_relativePaths()
 
 void tst_QFiledialog::task251321_sideBarHiddenEntries()
 {
+#if defined QT_BUILD_INTERNAL
     QNonNativeFileDialog fd;
 
     QDir current = QDir::currentPath();
@@ -1899,8 +1906,10 @@ void tst_QFiledialog::task251321_sideBarHiddenEntries()
     hiddenSubDir.rmdir("happy");
     hiddenDir.rmdir("subdir");
     current.rmdir(".hidden");
+#endif
 }
 
+#if defined QT_BUILD_INTERNAL
 class MyQSideBar : public QSidebar
 {
 public :
@@ -1918,9 +1927,11 @@ public :
                 model()->removeRow(indexes.at(i).row());
     }
 };
+#endif
 
 void tst_QFiledialog::task251341_sideBarRemoveEntries()
 {
+#if defined QT_BUILD_INTERNAL
     QNonNativeFileDialog fd;
 
     QDir current = QDir::currentPath();
@@ -1980,6 +1991,7 @@ void tst_QFiledialog::task251341_sideBarRemoveEntries()
     QCOMPARE(mySideBar.urls(), expected);
 
     current.rmdir("testDir");
+#endif
 }
 
 void tst_QFiledialog::task254490_selectFileMultipleTimes()
diff --git a/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp b/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp
index e415b02..d49083f 100644
--- a/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp
+++ b/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp
@@ -254,6 +254,7 @@ void tst_QFileSystemModel::naturalCompare_data()
 
 void tst_QFileSystemModel::naturalCompare()
 {
+#ifdef QT_BUILD_INTERNAL
     QFETCH(QString, s1);
     QFETCH(QString, s2);
     QFETCH(int, caseSensitive);
@@ -271,6 +272,7 @@ void tst_QFileSystemModel::naturalCompare()
     // created. The scheduler takes its time to recognize ended threads.
     QTest::qWait(300);
 #endif
+#endif
 }
 
 void tst_QFileSystemModel::readOnly()
diff --git a/tests/auto/qgl/qgl.pro b/tests/auto/qgl/qgl.pro
index 55e329d..420c4bb 100644
--- a/tests/auto/qgl/qgl.pro
+++ b/tests/auto/qgl/qgl.pro
@@ -3,7 +3,8 @@
 ############################################################
 
 load(qttest_p4)
-contains(QT_CONFIG, opengl):QT += opengl
+requires(contains(QT_CONFIG,opengl))
+QT += opengl
 
 SOURCES += tst_qgl.cpp
 
diff --git a/tests/auto/qgl/tst_qgl.cpp b/tests/auto/qgl/tst_qgl.cpp
index 078c559..96f5ddd 100644
--- a/tests/auto/qgl/tst_qgl.cpp
+++ b/tests/auto/qgl/tst_qgl.cpp
@@ -44,9 +44,7 @@
 
 #include <qcoreapplication.h>
 #include <qdebug.h>
-#ifndef QT_NO_OPENGL
 #include <qgl.h>
-#endif
 
 #include <QGraphicsView>
 #include <QGraphicsProxyWidget>
@@ -78,7 +76,6 @@ tst_QGL::~tst_QGL()
 {
 }
 
-#ifndef QT_NO_OPENGL
 class MyGLContext : public QGLContext
 {
 public:
@@ -96,13 +93,10 @@ public:
     bool autoBufferSwap() const { return QGLWidget::autoBufferSwap(); }
     void setAutoBufferSwap(bool on) { QGLWidget::setAutoBufferSwap(on); }
 };
-#endif
+
 // Testing get/set functions
 void tst_QGL::getSetCheck()
 {
-#ifdef QT_NO_OPENGL
-    QSKIP("QGL not yet supported", SkipAll);
-#else
     if (!QGLFormat::hasOpenGL())
         QSKIP("QGL not supported on this platform", SkipAll);
 
@@ -246,10 +240,9 @@ void tst_QGL::getSetCheck()
     QCOMPARE(false, obj3.autoBufferSwap());
     obj3.setAutoBufferSwap(true);
     QCOMPARE(true, obj3.autoBufferSwap());
-#endif
 }
 
-#ifndef QT_NO_OPENGL
+#ifdef QT_BUILD_INTERNAL
 QT_BEGIN_NAMESPACE
 extern QGLFormat::OpenGLVersionFlags qOpenGLVersionFlagsFromString(const QString &versionString);
 QT_END_NAMESPACE
@@ -257,9 +250,7 @@ QT_END_NAMESPACE
 
 void tst_QGL::openGLVersionCheck()
 {
-#ifdef QT_NO_OPENGL
-    QSKIP("QGL not yet supported", SkipAll);
-#else
+#ifdef QT_BUILD_INTERNAL
     if (!QGLFormat::hasOpenGL())
         QSKIP("QGL not supported on this platform", SkipAll);
 
@@ -366,9 +357,6 @@ public:
 
 void tst_QGL::graphicsViewClipping()
 {
-#ifdef QT_NO_OPENGL
-    QSKIP("QGL not supported", SkipAll);
-#else
     const int size = 64;
     UnclippedWidget *widget = new UnclippedWidget;
     widget->setFixedSize(size, size);
@@ -403,7 +391,6 @@ void tst_QGL::graphicsViewClipping()
     p.end();
 
     QCOMPARE(image, expected);
-#endif
 }
 
 void tst_QGL::partialGLWidgetUpdates_data()
@@ -420,9 +407,6 @@ void tst_QGL::partialGLWidgetUpdates_data()
 
 void tst_QGL::partialGLWidgetUpdates()
 {
-#ifdef QT_NO_OPENGL
-    QSKIP("QGL not yet supported", SkipAll);
-#else
     if (!QGLFormat::hasOpenGL())
         QSKIP("QGL not supported on this platform", SkipAll);
 
@@ -466,7 +450,6 @@ void tst_QGL::partialGLWidgetUpdates()
         QCOMPARE(widget.paintEventRegion, QRegion(50, 50, 50, 50));
     else
         QCOMPARE(widget.paintEventRegion, QRegion(widget.rect()));
-#endif
 }
 
 QTEST_MAIN(tst_QGL)
diff --git a/tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro b/tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro
index 3283873..e19d962 100644
--- a/tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro
+++ b/tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro
@@ -2,4 +2,6 @@ load(qttest_p4)
 SOURCES  += tst_qhttpnetworkconnection.cpp
 INCLUDEPATH += $$(QTDIR)/src/3rdparty/zlib
 
+requires(contains(QT_CONFIG,private_tests))
+
 QT = core network
diff --git a/tests/auto/qhttpnetworkreply/qhttpnetworkreply.pro b/tests/auto/qhttpnetworkreply/qhttpnetworkreply.pro
index 2e41fcd..f86250a 100644
--- a/tests/auto/qhttpnetworkreply/qhttpnetworkreply.pro
+++ b/tests/auto/qhttpnetworkreply/qhttpnetworkreply.pro
@@ -2,4 +2,6 @@ load(qttest_p4)
 SOURCES  += tst_qhttpnetworkreply.cpp
 INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/zlib
 
+requires(contains(QT_CONFIG,private_tests))
+
 QT = core network
diff --git a/tests/auto/qitemeditorfactory/tst_qitemeditorfactory.cpp b/tests/auto/qitemeditorfactory/tst_qitemeditorfactory.cpp
index d9a7d56..e235ff5 100644
--- a/tests/auto/qitemeditorfactory/tst_qitemeditorfactory.cpp
+++ b/tests/auto/qitemeditorfactory/tst_qitemeditorfactory.cpp
@@ -59,13 +59,13 @@ void tst_QItemEditorFactory::createEditor()
     QCOMPARE(w->metaObject()->className(), "QExpandingLineEdit");
 }
 
-void tst_QItemEditorFactory::createCustomEditor()
+//we make it inherit from QObject so that we can use QPointer
+class MyEditor : public QObject, public QStandardItemEditorCreator<QDoubleSpinBox>
 {
-    //we make it inherit from QObject so that we can use QPointer
-    class MyEditor : public QObject, public QStandardItemEditorCreator<QDoubleSpinBox>
-    {
-    };
+};
 
+void tst_QItemEditorFactory::createCustomEditor()
+{
     QPointer<MyEditor> creator = new MyEditor;
     QPointer<MyEditor> creator2 = new MyEditor;
 
diff --git a/tests/auto/qkeysequence/tst_qkeysequence.cpp b/tests/auto/qkeysequence/tst_qkeysequence.cpp
index aeb57ef..2e4b850 100644
--- a/tests/auto/qkeysequence/tst_qkeysequence.cpp
+++ b/tests/auto/qkeysequence/tst_qkeysequence.cpp
@@ -270,7 +270,7 @@ void tst_QKeySequence::checkMultipleNames()
 void tst_QKeySequence::ensureSorted()
 {
 //### accessing static members from private classes does not work on msvc at the moment
-#ifndef Q_WS_WIN
+#if defined(QT_BUILD_INTERNAL) && !defined(Q_WS_WIN)
     uint N = QKeySequencePrivate::numberOfKeyBindings;
     uint val = QKeySequencePrivate::keyBindings[0].shortcut;
     for ( uint i = 1 ; i < N ; ++i) {
diff --git a/tests/auto/qmainwindow/tst_qmainwindow.cpp b/tests/auto/qmainwindow/tst_qmainwindow.cpp
index e46c2e1..6ae7a3e 100644
--- a/tests/auto/qmainwindow/tst_qmainwindow.cpp
+++ b/tests/auto/qmainwindow/tst_qmainwindow.cpp
@@ -1400,6 +1400,7 @@ void AddDockWidget::apply(QMainWindow *mw) const
     }
 }
 
+#ifdef QT_BUILD_INTERNAL
 struct MoveSeparator
 {
     MoveSeparator() {}
@@ -1436,6 +1437,7 @@ void MoveSeparator::apply(QMainWindow *mw) const
 
     l->layoutState.dockAreaLayout.separatorMove(path, QPoint(0, 0), QPoint(delta, delta));
 }
+#endif
 
 QMap<QString, QRect> dockWidgetGeometries(QMainWindow *mw)
 {
@@ -1463,6 +1465,7 @@ QMap<QString, QRect> dockWidgetGeometries(QMainWindow *mw)
 
 void tst_QMainWindow::saveRestore_data()
 {
+#ifdef QT_BUILD_INTERNAL
     QTest::addColumn<AddList >("addList");
     QTest::addColumn<MoveList >("moveList");
 
@@ -1497,10 +1500,12 @@ void tst_QMainWindow::saveRestore_data()
                           << MoveSeparator(-30, "right1")
                           << MoveSeparator(30, "right2a")
                           );
+#endif
 }
 
 void tst_QMainWindow::saveRestore()
 {
+#ifdef QT_BUILD_INTERNAL
     QFETCH(AddList, addList);
     QFETCH(MoveList, moveList);
 
@@ -1570,6 +1575,7 @@ void tst_QMainWindow::saveRestore()
         mainWindow.show();
         COMPARE_DOCK_WIDGET_GEOS(dockWidgetGeos, dockWidgetGeometries(&mainWindow));
     }
+#endif
 }
 
 void tst_QMainWindow::iconSizeChanged()
diff --git a/tests/auto/qnativesocketengine/qnativesocketengine.pro b/tests/auto/qnativesocketengine/qnativesocketengine.pro
index 320f24c..ad40d53 100644
--- a/tests/auto/qnativesocketengine/qnativesocketengine.pro
+++ b/tests/auto/qnativesocketengine/qnativesocketengine.pro
@@ -3,6 +3,8 @@ SOURCES  += tst_qnativesocketengine.cpp
 
 include(../qnativesocketengine/qsocketengine.pri)
 
+requires(contains(QT_CONFIG,private_tests))
+
 MOC_DIR=tmp
 
 QT = core network
diff --git a/tests/auto/qnetworkreply/qnetworkreply.pro b/tests/auto/qnetworkreply/qnetworkreply.pro
index 0bcf067..fd8454c 100644
--- a/tests/auto/qnetworkreply/qnetworkreply.pro
+++ b/tests/auto/qnetworkreply/qnetworkreply.pro
@@ -1,4 +1,6 @@
 TEMPLATE = subdirs
 SUBDIRS = test
 
+requires(contains(QT_CONFIG,private_tests))
+
 !wince*:SUBDIRS += echo
diff --git a/tests/auto/qpathclipper/qpathclipper.pro b/tests/auto/qpathclipper/qpathclipper.pro
index 675e463..dc9d60f 100644
--- a/tests/auto/qpathclipper/qpathclipper.pro
+++ b/tests/auto/qpathclipper/qpathclipper.pro
@@ -3,6 +3,8 @@ INCLUDEPATH += .
 HEADERS += paths.h
 SOURCES  += tst_qpathclipper.cpp paths.cpp
 
+requires(contains(QT_CONFIG,private_tests))
+
 unix:!mac:LIBS+=-lm
 
 
diff --git a/tests/auto/qplaintextedit/tst_qplaintextedit.cpp b/tests/auto/qplaintextedit/tst_qplaintextedit.cpp
index fceefd2..40ad539 100644
--- a/tests/auto/qplaintextedit/tst_qplaintextedit.cpp
+++ b/tests/auto/qplaintextedit/tst_qplaintextedit.cpp
@@ -1106,6 +1106,7 @@ void tst_QPlainTextEdit::mimeDataReimplementations()
     QCOMPARE(ed.canInsertCallCount, 0);
     QCOMPARE(ed.insertCallCount, 0);
 
+#ifdef QT_BUILD_INTERNAL
     QTextControl *control = qFindChild<QTextControl *>(&ed);
     QVERIFY(control);
 
@@ -1120,6 +1121,7 @@ void tst_QPlainTextEdit::mimeDataReimplementations()
     QCOMPARE(ed.createMimeDataCallCount, 1);
     QCOMPARE(ed.canInsertCallCount, 1);
     QCOMPARE(ed.insertCallCount, 1);
+#endif
 }
 
 void tst_QPlainTextEdit::shiftEnterShouldInsertLineSeparator()
diff --git a/tests/auto/qregion/tst_qregion.cpp b/tests/auto/qregion/tst_qregion.cpp
index 3ffa87e..2ad202d 100644
--- a/tests/auto/qregion/tst_qregion.cpp
+++ b/tests/auto/qregion/tst_qregion.cpp
@@ -96,7 +96,7 @@ private slots:
 #ifdef Q_OS_WIN
     void handle();
 #endif
-#ifdef Q_WS_X11
+#if defined(Q_WS_X11) && defined(QT_BUILD_INTERNAL)
     void clipRectangles();
 #endif
 
@@ -865,7 +865,7 @@ void tst_QRegion::handle()
 }
 #endif
 
-#ifdef Q_WS_X11
+#if defined(Q_WS_X11) && defined(QT_BUILD_INTERNAL)
 void tst_QRegion::clipRectangles()
 {
     QRegion region(30, 30, 30, 30);
@@ -967,6 +967,7 @@ void tst_QRegion::regionToPath_data()
 
 void tst_QRegion::regionToPath()
 {
+#ifdef QT_BUILD_INTERNAL
     extern QPainterPath qt_regionToPath(const QRegion &region);
 
     QFETCH(QPainterPath, path);
@@ -1002,6 +1003,7 @@ void tst_QRegion::regionToPath()
         QCOMPARE(ia, ib);
         QCOMPARE(a.boundingRect(), b.boundingRect());
     }
+#endif
 }
 
 QTEST_MAIN(tst_QRegion)
diff --git a/tests/auto/qsettings/tst_qsettings.cpp b/tests/auto/qsettings/tst_qsettings.cpp
index f0f446d..77fef1f 100644
--- a/tests/auto/qsettings/tst_qsettings.cpp
+++ b/tests/auto/qsettings/tst_qsettings.cpp
@@ -713,6 +713,7 @@ void tst_QSettings::testErrorHandling_data()
 
 void tst_QSettings::testErrorHandling()
 {
+#ifdef QT_BUILD_INTERNAL
 #ifdef Q_OS_WIN
     QSKIP("Windows doesn't support most file modes, including read-only directories, so this test is moot.", SkipAll);
 #else
@@ -776,6 +777,7 @@ void tst_QSettings::testErrorHandling()
         QCOMPARE((int)settings.status(), statusAfterSetAndSync);
     }
 #endif // !Q_OS_WIN
+#endif
 }
 
 Q_DECLARE_METATYPE(QVariant)
@@ -821,6 +823,7 @@ void tst_QSettings::testIniParsing_data()
 
 void tst_QSettings::testIniParsing()
 {
+#ifdef QT_BUILD_INTERNAL
     qRegisterMetaType<QVariant>("QVariant");
     qRegisterMetaType<QSettings::Status>("QSettings::Status");
 
@@ -854,6 +857,7 @@ void tst_QSettings::testIniParsing()
     }
 
     QCOMPARE(settings.status(), status);
+#endif
 }
 
 /*
@@ -1058,6 +1062,7 @@ void tst_QSettings::testVariantTypes_data()
 
 void tst_QSettings::testVariantTypes()
 {
+#ifdef QT_BUILD_INTERNAL
 #define testVal(key, val, tp, rtype) \
     { \
         QSettings settings1(format, QSettings::UserScope, "software.org", "KillerAPP"); \
@@ -1141,6 +1146,7 @@ void tst_QSettings::testVariantTypes()
     }
 
 #undef testVal
+#endif
 }
 
 void tst_QSettings::remove()
@@ -1801,9 +1807,7 @@ void tst_QSettings::testNormalizedKey_data()
 
 void tst_QSettings::testNormalizedKey()
 {
-#ifdef QTEST_REDUCED_EXPORTS
-    QSKIP("We can't test QSettingsPrivate on Windows", SkipAll);
-#else
+#ifdef QT_BUILD_INTERNAL
     QFETCH(QString, inKey);
     QFETCH(QString, outKey);
 
@@ -1981,6 +1985,7 @@ void tst_QSettings::fromFile()
 
 void tst_QSettings::setIniCodec()
 {
+#ifdef QT_BUILD_INTERNAL
     QByteArray expeContents4, expeContents5;
     QByteArray actualContents4, actualContents5;
 
@@ -2040,6 +2045,7 @@ void tst_QSettings::setIniCodec()
     QCOMPARE(settings4.allKeys().first(), settings5.allKeys().first());
     QCOMPARE(settings4.value(settings4.allKeys().first()).toString(),
              settings5.value(settings5.allKeys().first()).toString());
+#endif
 }
 
 static bool containsSubList(QStringList mom, QStringList son)
@@ -2316,6 +2322,7 @@ void tst_QSettings::testArrays()
     settings1.endArray();
 }
 
+#ifdef QT_BUILD_INTERNAL
 static QByteArray iniEscapedKey(const QString &str)
 {
     QByteArray result;
@@ -2360,6 +2367,7 @@ static QStringList iniUnescapedStringList(const QByteArray &ba)
 #endif
     return result;
 }
+#endif
 
 QString escapeWeirdChars(const QString &s)
 {
@@ -2383,6 +2391,7 @@ QString escapeWeirdChars(const QString &s)
 
 void tst_QSettings::testEscapes()
 {
+#ifdef QT_BUILD_INTERNAL
     QSettings settings(QSettings::UserScope, "software.org", "KillerAPP");
 
 #define testEscapedKey(plainKey, escKey) \
@@ -2505,6 +2514,7 @@ void tst_QSettings::testEscapes()
     testBadEscape("@Rect)", "@Rect)");
     testBadEscape("@Rect(1 2 3)", "@Rect(1 2 3)");
     testBadEscape("@@Rect(1 2 3)", "@Rect(1 2 3)");
+#endif
 }
 
 void tst_QSettings::testCompatFunctions()
@@ -3355,6 +3365,7 @@ void tst_QSettings::childGroups_data()
 
 void tst_QSettings::childGroups()
 {
+#ifdef QT_BUILD_INTERNAL
     QFETCH(QSettings::Format, format);
 
     {
@@ -3408,6 +3419,7 @@ void tst_QSettings::childGroups()
 
         QCOMPARE(settings.childGroups(), QStringList() << "alpha" << "gamma" << "omicron" << "zeta");
     }
+#endif
 }
 
 void tst_QSettings::childKeys_data()
@@ -3417,6 +3429,7 @@ void tst_QSettings::childKeys_data()
 
 void tst_QSettings::childKeys()
 {
+#ifdef QT_BUILD_INTERNAL
     QFETCH(QSettings::Format, format);
 
     {
@@ -3470,6 +3483,7 @@ void tst_QSettings::childKeys()
 
         QCOMPARE(settings.childKeys(), QStringList() << "alpha" << "beta" << "gamma");
     }
+#endif
 }
 
 void tst_QSettings::allKeys_data()
@@ -3479,6 +3493,7 @@ void tst_QSettings::allKeys_data()
 
 void tst_QSettings::allKeys()
 {
+#ifdef QT_BUILD_INTERNAL
     QFETCH(QSettings::Format, format);
 
     QStringList allKeys;
@@ -3527,6 +3542,7 @@ void tst_QSettings::allKeys()
 
         QCOMPARE(settings.allKeys(), allKeys);
     }
+#endif
 }
 
 void tst_QSettings::registerFormat()
diff --git a/tests/auto/qsharedpointer/qsharedpointer.pro b/tests/auto/qsharedpointer/qsharedpointer.pro
index 30c81cb..90fde06 100644
--- a/tests/auto/qsharedpointer/qsharedpointer.pro
+++ b/tests/auto/qsharedpointer/qsharedpointer.pro
@@ -4,5 +4,6 @@ SOURCES += tst_qsharedpointer.cpp \
     forwarddeclared.cpp
 QT = core
 DEFINES += SRCDIR=\\\"$$PWD/\\\"
+requires(contains(QT_CONFIG,private_tests))
 include(externaltests.pri)
 HEADERS += forwarddeclared.h
diff --git a/tests/auto/qsocketnotifier/qsocketnotifier.pro b/tests/auto/qsocketnotifier/qsocketnotifier.pro
index 10ed3a5..ec924c1 100644
--- a/tests/auto/qsocketnotifier/qsocketnotifier.pro
+++ b/tests/auto/qsocketnotifier/qsocketnotifier.pro
@@ -2,6 +2,8 @@ load(qttest_p4)
 SOURCES += tst_qsocketnotifier.cpp
 QT = core network
 
+requires(contains(QT_CONFIG,private_tests))
+
 include(../qnativesocketengine/qsocketengine.pri)
 
 
diff --git a/tests/auto/qsocks5socketengine/qsocks5socketengine.pro b/tests/auto/qsocks5socketengine/qsocks5socketengine.pro
index 2949ee2..d19b732 100644
--- a/tests/auto/qsocks5socketengine/qsocks5socketengine.pro
+++ b/tests/auto/qsocks5socketengine/qsocks5socketengine.pro
@@ -11,3 +11,4 @@ QT = core network
 
 
 
+requires(contains(QT_CONFIG,private_tests))
diff --git a/tests/auto/qstandarditemmodel/tst_qstandarditemmodel.cpp b/tests/auto/qstandarditemmodel/tst_qstandarditemmodel.cpp
index fa44034..fba7b1b 100644
--- a/tests/auto/qstandarditemmodel/tst_qstandarditemmodel.cpp
+++ b/tests/auto/qstandarditemmodel/tst_qstandarditemmodel.cpp
@@ -1454,6 +1454,7 @@ static QStandardItem *itemFromText(QStandardItem *parent, const QString &text)
     return item;
 }
 
+#ifdef QT_BUILD_INTERNAL
 static QModelIndex indexFromText(QStandardItemModel *model, const QString &text)
 {
     QStandardItem *item = itemFromText(model->invisibleRootItem(), text);
@@ -1467,9 +1468,11 @@ struct FriendlyTreeView : public QTreeView
     friend class tst_QStandardItemModel;
 	Q_DECLARE_PRIVATE(QTreeView)
 };
+#endif
 
 void tst_QStandardItemModel::treeDragAndDrop()
 {
+#ifdef QT_BUILD_INTERNAL
     const int nRow = 5;
     const int nCol = 3;
 
@@ -1605,6 +1608,7 @@ void tst_QStandardItemModel::treeDragAndDrop()
 
         QVERIFY(compareModels(&model, &checkModel));
     }
+#endif
 }
 
 void tst_QStandardItemModel::removeRowsAndColumns()
diff --git a/tests/auto/qstatemachine/tst_qstatemachine.cpp b/tests/auto/qstatemachine/tst_qstatemachine.cpp
index a859866..efcb983 100644
--- a/tests/auto/qstatemachine/tst_qstatemachine.cpp
+++ b/tests/auto/qstatemachine/tst_qstatemachine.cpp
@@ -1015,6 +1015,7 @@ void tst_QStateMachine::rootState()
 
 void tst_QStateMachine::addAndRemoveState()
 {
+#ifdef QT_BUILD_INTERNAL
     QStateMachine machine;
     QStatePrivate *root_d = QStatePrivate::get(machine.rootState());
     QCOMPARE(root_d->childStates().size(), 0); 
@@ -1075,6 +1076,7 @@ void tst_QStateMachine::addAndRemoveState()
     delete s2;
     // ### how to deal with this?
     // machine.removeState(machine.errorState());
+#endif
 }
 
 void tst_QStateMachine::stateEntryAndExit()
diff --git a/tests/auto/qstylesheetstyle/qstylesheetstyle.pro b/tests/auto/qstylesheetstyle/qstylesheetstyle.pro
index 6acb0b4..f6101f4 100644
--- a/tests/auto/qstylesheetstyle/qstylesheetstyle.pro
+++ b/tests/auto/qstylesheetstyle/qstylesheetstyle.pro
@@ -13,3 +13,4 @@ contains(QT_CONFIG, qt3support): QT += qt3support
 # Input
 SOURCES += tst_qstylesheetstyle.cpp
 RESOURCES += resources.qrc
+requires(contains(QT_CONFIG,private_tests))
diff --git a/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp b/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp
index 7b62eae..3f658ec 100644
--- a/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp
+++ b/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp
@@ -625,9 +625,11 @@ void tst_QSvgRenderer::testGzLoading()
     QVERIFY(autoDetectGzData.isValid());
 }
 
+#ifdef QT_BUILD_INTERNAL
 QT_BEGIN_NAMESPACE
 QByteArray qt_inflateGZipDataFrom(QIODevice *device);
 QT_END_NAMESPACE
+#endif
 
 void tst_QSvgRenderer::testGzHelper_data()
 {
@@ -660,6 +662,7 @@ void tst_QSvgRenderer::testGzHelper_data()
 
 void tst_QSvgRenderer::testGzHelper()
 {
+#ifdef QT_BUILD_INTERNAL
     QFETCH(QByteArray, in);
     QFETCH(QByteArray, out);
 
@@ -668,6 +671,7 @@ void tst_QSvgRenderer::testGzHelper()
     QVERIFY(buffer.isReadable());
     QByteArray result = qt_inflateGZipDataFrom(&buffer);
     QCOMPARE(result, out);
+#endif
 }
 #endif
 
diff --git a/tests/auto/qtextedit/tst_qtextedit.cpp b/tests/auto/qtextedit/tst_qtextedit.cpp
index 3bc1517..d54645c 100644
--- a/tests/auto/qtextedit/tst_qtextedit.cpp
+++ b/tests/auto/qtextedit/tst_qtextedit.cpp
@@ -1460,6 +1460,7 @@ void tst_QTextEdit::mimeDataReimplementations()
     QCOMPARE(ed.canInsertCallCount, 0);
     QCOMPARE(ed.insertCallCount, 0);
 
+#ifdef QT_BUILD_INTERNAL
     QTextControl *control = qFindChild<QTextControl *>(&ed);
     QVERIFY(control);
 
@@ -1474,6 +1475,7 @@ void tst_QTextEdit::mimeDataReimplementations()
     QCOMPARE(ed.createMimeDataCallCount, 1);
     QCOMPARE(ed.canInsertCallCount, 1);
     QCOMPARE(ed.insertCallCount, 1);
+#endif
 }
 
 void tst_QTextEdit::ctrlEnterShouldInsertLineSeparator_NOT()
@@ -2066,6 +2068,7 @@ void tst_QTextEdit::cursorRect()
 
 void tst_QTextEdit::setDocumentPreservesPalette()
 {
+#ifdef QT_BUILD_INTERNAL
     QTextControl *control = qFindChild<QTextControl *>(ed);
     QVERIFY(control);
 
@@ -2085,6 +2088,7 @@ void tst_QTextEdit::setDocumentPreservesPalette()
     QVERIFY(control->document() == newDoc);
     QVERIFY(whitePal.color(QPalette::Active, QPalette::Text)
             == control->palette().color(QPalette::Active, QPalette::Text));
+#endif
 }
 
 class PublicTextEdit : public QTextEdit
diff --git a/tests/auto/qtextpiecetable/qtextpiecetable.pro b/tests/auto/qtextpiecetable/qtextpiecetable.pro
index 318a8c7..0926b83 100644
--- a/tests/auto/qtextpiecetable/qtextpiecetable.pro
+++ b/tests/auto/qtextpiecetable/qtextpiecetable.pro
@@ -2,7 +2,6 @@ load(qttest_p4)
 SOURCES  += tst_qtextpiecetable.cpp
 HEADERS += ../qtextdocument/common.h
 
-!win32:DEFINES += QTEST_REDUCED_EXPORTS
-
-
+requires(!win32)
+requires(contains(QT_CONFIG,private_tests))
 
diff --git a/tests/auto/qtextpiecetable/tst_qtextpiecetable.cpp b/tests/auto/qtextpiecetable/tst_qtextpiecetable.cpp
index accbabb..0e60c16 100644
--- a/tests/auto/qtextpiecetable/tst_qtextpiecetable.cpp
+++ b/tests/auto/qtextpiecetable/tst_qtextpiecetable.cpp
@@ -42,9 +42,7 @@
 
 #include <QtTest/QtTest>
 
-#ifdef QTEST_REDUCED_EXPORTS
 #define private public
-#endif
 
 #include <qtextdocument.h>
 #include <private/qtextdocument_p.h>
@@ -65,7 +63,6 @@ public:
     tst_QTextPieceTable();
 
 
-#ifdef QTEST_REDUCED_EXPORTS
 public slots:
     void init();
     void cleanup();
@@ -112,13 +109,7 @@ private slots:
     void removeFrameDirect();
     void removeWithChildFrame();
     void clearWithFrames();
-#else
-public slots:
-    void init();
-    void cleanup();
-private slots:
-    void skip();
-#endif
+
 private:
     QTextDocument *doc;
     QTextDocumentPrivate *table;
@@ -130,8 +121,6 @@ tst_QTextPieceTable::tst_QTextPieceTable()
 { doc = 0; table = 0; }
 
 
-#ifdef QTEST_REDUCED_EXPORTS
-
 void tst_QTextPieceTable::init()
 {
     doc = new QTextDocument(0);
@@ -1148,25 +1137,6 @@ void tst_QTextPieceTable::clearWithFrames()
     QVERIFY(true);
 }
 
-#else // QTEST_REDUCED_EXPORTS
-
-void tst_QTextPieceTable::init()
-{
-}
-
-void tst_QTextPieceTable::cleanup()
-{
-}
-
-void tst_QTextPieceTable::skip()
-{
-    QSKIP( "Not tested on win32", SkipAll );
-}
-
-
-#endif // QTEST_REDUCED_EXPORTS
-
-
 QTEST_MAIN(tst_QTextPieceTable)
 
 
diff --git a/tests/auto/qurl/tst_qurl.cpp b/tests/auto/qurl/tst_qurl.cpp
index ea551da..723f882 100644
--- a/tests/auto/qurl/tst_qurl.cpp
+++ b/tests/auto/qurl/tst_qurl.cpp
@@ -3057,12 +3057,15 @@ void tst_QUrl::nameprep_testsuite_data()
         << QString() << 0 << 0;
 }
 
+#ifdef QT_BUILD_INTERNAL
 QT_BEGIN_NAMESPACE
 extern QString qt_nameprep(const QString &source);
 QT_END_NAMESPACE
+#endif
 
 void tst_QUrl::nameprep_testsuite()
 {
+#ifdef QT_BUILD_INTERNAL
     QFETCH(QString, in);
     QFETCH(QString, out);
     QFETCH(QString, profile);
@@ -3082,6 +3085,7 @@ void tst_QUrl::nameprep_testsuite()
     QEXPECT_FAIL("Larger test (expanding)",
                  "Investigate further", Continue);
     QCOMPARE(qt_nameprep(in), out);
+#endif
 }
 
 void tst_QUrl::ace_testsuite_data()
diff --git a/tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro b/tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro
index e90b335..3d82eaf 100644
--- a/tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro
+++ b/tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro
@@ -2,3 +2,4 @@ TEMPLATE = subdirs
 CONFIG += ordered
 
 SUBDIRS = ../xmlpatternsxqts test
+requires(contains(QT_CONFIG,private_tests))
diff --git a/tests/auto/xmlpatternsview/xmlpatternsview.pro b/tests/auto/xmlpatternsview/xmlpatternsview.pro
index 3544264..04ee4d0 100644
--- a/tests/auto/xmlpatternsview/xmlpatternsview.pro
+++ b/tests/auto/xmlpatternsview/xmlpatternsview.pro
@@ -6,3 +6,4 @@ SUBDIRS = ../xmlpatternsxqts test
 contains(QT_CONFIG,xmlpatterns) {
   SUBDIRS += view
 }
+requires(contains(QT_CONFIG,private_tests))
diff --git a/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro b/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro
index 368a028..a3b13da 100644
--- a/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro
+++ b/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro
@@ -9,3 +9,6 @@ contains(QT_CONFIG,xmlpatterns) {
 # Needed on the win32-g++ setup and on the test machine arsia.
 INCLUDEPATH += $$QT_BUILD_TREE/include/QtXmlPatterns/private \
                ../../../include/QtXmlPatterns/private
+
+requires(contains(QT_CONFIG,private_tests))
+
diff --git a/tests/auto/xmlpatternsxslts/xmlpatternsxslts.pro b/tests/auto/xmlpatternsxslts/xmlpatternsxslts.pro
index 4a688c4..9b63a52 100644
--- a/tests/auto/xmlpatternsxslts/xmlpatternsxslts.pro
+++ b/tests/auto/xmlpatternsxslts/xmlpatternsxslts.pro
@@ -23,3 +23,4 @@ wince*: {
     DEPLOYMENT += testdata
 }
 
+requires(contains(QT_CONFIG,private_tests))