1 files changed, 49 insertions, 4 deletions

diff --git a/tests/auto/tools/qmake/tst_qmake.cpp b/tests/auto/tools/qmake/tst_qmake.cpp
index 09e725f98a..9b434a7b5b 100644
--- a/tests/auto/tools/qmake/tst_qmake.cpp
+++ b/tests/auto/tools/qmake/tst_qmake.cpp
@@ -33,6 +33,7 @@
 #include <QDir>
 #include <QDirIterator>
 #include <QObject>
+#include <QRegularExpression>
 #include <QStandardPaths>
 #include <QTemporaryDir>
 
@@ -75,14 +76,17 @@ private slots:
     void findMocs();
     void findDeps();
     void rawString();
-#if defined(Q_OS_MAC)
+#if defined(Q_OS_DARWIN)
     void bundle_spaces();
+#elif defined(Q_OS_WIN)
+    void windowsResources();
 #endif
     void substitutes();
     void project();
     void proFileCache();
     void qinstall();
     void resources();
+    void conflictingTargets();
 
 private:
     TestCompiler test_compiler;
@@ -423,7 +427,7 @@ void tst_qmake::prompt()
 {
 #if 0
     QProcess qmake;
-    qmake.setReadChannelMode(QProcess::MergedChannels);
+    qmake.setProcessChannelMode(QProcess::MergedChannels);
     qmake.setWorkingDirectory(QLatin1String("testdata/prompt"));
     qmake.start(QLatin1String("qmake CONFIG-=debug_and_release CONFIG-=debug CONFIG+=release"),
                 QIODevice::Text | QIODevice::ReadWrite);
@@ -511,7 +515,8 @@ struct TempFile
     }
 };
 
-#if defined(Q_OS_MAC)
+#if defined(Q_OS_DARWIN)
+
 void tst_qmake::bundle_spaces()
 {
     QString workDir = base_path + "/testdata/bundle-spaces";
@@ -542,7 +547,34 @@ void tst_qmake::bundle_spaces()
     QVERIFY( !non_existing_file.exists() );
     QVERIFY( test_compiler.removeMakefile(workDir) );
 }
-#endif // defined(Q_OS_MAC)
+
+#elif defined(Q_OS_WIN) // defined(Q_OS_DARWIN)
+
+void tst_qmake::windowsResources()
+{
+    QString workDir = base_path + "/testdata/windows_resources";
+    QVERIFY(test_compiler.qmake(workDir, "windows_resources"));
+    QVERIFY(test_compiler.make(workDir));
+
+    // Another "make" must not rebuild the .res file
+    test_compiler.clearCommandOutput();
+    QVERIFY(test_compiler.make(workDir));
+    QVERIFY(!test_compiler.commandOutput().contains("windows_resources.rc"));
+    test_compiler.clearCommandOutput();
+
+    // Wait a second to make sure we get a new timestamp in the touch below
+    QTest::qWait(1000);
+
+    // Touch the deepest include of the .rc file
+    QVERIFY(test_compiler.runCommand("cmd", QStringList{"/c",
+                        "echo.>>" + QDir::toNativeSeparators(workDir + "/version.inc")}));
+
+    // The next "make" must rebuild the .res file
+    QVERIFY(test_compiler.make(workDir));
+    QVERIFY(test_compiler.commandOutput().contains("windows_resources.rc"));
+}
+
+#endif // defined(Q_OS_WIN)
 
 void tst_qmake::substitutes()
 {
@@ -717,5 +749,18 @@ void tst_qmake::resources()
     QVERIFY(test_compiler.make(workDir));
 }
 
+void tst_qmake::conflictingTargets()
+{
+    QString workDir = base_path + "/testdata/conflicting_targets";
+    QVERIFY(test_compiler.qmake(workDir, "conflicting_targets"));
+    const QRegularExpression rex("Targets of builds '([^']+)' and '([^']+)' conflict");
+    auto match = rex.match(test_compiler.commandOutput());
+    QVERIFY(match.hasMatch());
+    QStringList builds = { match.captured(1), match.captured(2) };
+    std::sort(builds.begin(), builds.end());
+    const QStringList expectedBuilds{"Debug", "Release"};
+    QCOMPARE(builds, expectedBuilds);
+}
+
 QTEST_MAIN(tst_qmake)
 #include "tst_qmake.moc"