Autotest: don't allow choosing between debug/release mode.

You can't build for debug mode on Windows if Qt wasn't built in debug
mode. So force the selection to be exactly what Qt was built.

Reviewed-by: Trust Me

3 files changed, 4 insertions, 18 deletions

diff --git a/tests/auto/qsharedpointer/externaltests.cpp b/tests/auto/qsharedpointer/externaltests.cpp
index eb2f27dd2f..0b1ef19a58 100644
--- a/tests/auto/qsharedpointer/externaltests.cpp
+++ b/tests/auto/qsharedpointer/externaltests.cpp
@@ -140,7 +140,6 @@ namespace QTest {
         QExternalTestPrivate()
             : qtModules(QExternalTest::QtCore | QExternalTest::QtGui | QExternalTest::QtTest),
               appType(QExternalTest::AutoApplication),
-              debugMode(true),
               exitCode(-1)
         {
         }
@@ -156,7 +155,6 @@ namespace QTest {
         QByteArray programHeader;
         QExternalTest::QtModules qtModules;
         QExternalTest::ApplicationType appType;
-        bool debugMode;
 
         QString temporaryDir;
         QByteArray sourceCode;
@@ -190,16 +188,6 @@ namespace QTest {
         delete d;
     }
 
-    bool QExternalTest::isDebugMode() const
-    {
-        return d->debugMode;
-    }
-
-    void QExternalTest::setDebugMode(bool enable)
-    {
-        d->debugMode = enable;
-    }
-
     QList<QByteArray> QExternalTest::qmakeSettings() const
     {
         return d->qmakeLines;
@@ -524,10 +512,11 @@ namespace QTest {
             "INCLUDEPATH += . ");
         projectFile.write(QFile::encodeName(QDir::currentPath()));
 
-        if (debugMode)
+#ifndef QT_NO_DEBUG
             projectFile.write("\nCONFIG  += debug\n");
-        else
+#else
             projectFile.write("\nCONFIG  += release\n");
+#endif
 
         QByteArray extraSources = QFile::encodeName(extraProgramSources.join(" "));
         if (!extraSources.isEmpty()) {
diff --git a/tests/auto/qsharedpointer/externaltests.h b/tests/auto/qsharedpointer/externaltests.h
index 5e79a7d47c..1170cd54a8 100644
--- a/tests/auto/qsharedpointer/externaltests.h
+++ b/tests/auto/qsharedpointer/externaltests.h
@@ -91,9 +91,6 @@ namespace QTest {
             QApplicationGuiServer
         };
 
-        bool isDebugMode() const;
-        void setDebugMode(bool enable);
-
         QList<QByteArray> qmakeSettings() const;
         void setQmakeSettings(const QList<QByteArray> &settings);
 
diff --git a/tests/auto/qsharedpointer/tst_qsharedpointer.cpp b/tests/auto/qsharedpointer/tst_qsharedpointer.cpp
index 7cfa86871e..cb32c9a297 100644
--- a/tests/auto/qsharedpointer/tst_qsharedpointer.cpp
+++ b/tests/auto/qsharedpointer/tst_qsharedpointer.cpp
@@ -1717,11 +1717,11 @@ void tst_QSharedPointer::invalidConstructs()
 #endif
 
     QTest::QExternalTest test;
-    test.setDebugMode(true);
     test.setQtModules(QTest::QExternalTest::QtCore);
     test.setExtraProgramSources(QStringList() << SRCDIR "forwarddeclared.cpp");
     test.setProgramHeader(
         "#define QT_SHAREDPOINTER_TRACK_POINTERS\n"
+        "#define QT_DEBUG\n"
         "#include <QtCore/qsharedpointer.h>\n"
         "#include <QtCore/qcoreapplication.h>\n"
         "\n"