Merge "Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake" into wip/cmake

1 files changed, 13 insertions, 6 deletions

diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
index b79fd8f250..27d2a7c0a5 100644
--- a/qmake/generators/win32/winmakefile.cpp
+++ b/qmake/generators/win32/winmakefile.cpp
@@ -79,7 +79,7 @@ Win32MakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags)
     ProStringList impexts = project->values("QMAKE_LIB_EXTENSIONS");
     if (impexts.isEmpty())
         impexts = project->values("QMAKE_EXTENSION_STATICLIB");
-    QList<QMakeLocalFileName> dirs;
+    QVector<QMakeLocalFileName> dirs;
     int libidx = 0;
     for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS"))
         dirs.append(QMakeLocalFileName(dlib.toQString()));
@@ -104,8 +104,7 @@ Win32MakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags)
             QString lib = arg.toQString();
             ProString verovr =
                     project->first(ProKey("QMAKE_" + lib.toUpper() + "_VERSION_OVERRIDE"));
-            for (QList<QMakeLocalFileName>::Iterator dir_it = dirs.begin();
-                 dir_it != dirs.end(); ++dir_it) {
+            for (auto dir_it = dirs.begin(); dir_it != dirs.end(); ++dir_it) {
                 QString cand = (*dir_it).real() + Option::dir_sep + lib;
                 if (linkPrl && processPrlFile(cand, true)) {
                     (*it) = cand;
@@ -128,8 +127,7 @@ Win32MakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags)
                 if (processPrlFile(lib, false))
                     (*it) = lib;
             } else {
-                for (QList<QMakeLocalFileName>::Iterator dir_it = dirs.begin();
-                     dir_it != dirs.end(); ++dir_it) {
+                for (auto dir_it = dirs.begin(); dir_it != dirs.end(); ++dir_it) {
                     QString cand = (*dir_it).real() + Option::dir_sep + lib;
                     if (processPrlFile(cand, false)) {
                         (*it) = cand;
@@ -669,6 +667,9 @@ void Win32MakefileGenerator::writeRcFilePart(QTextStream &t)
             incPathStr += escapeFilePath(path);
         }
 
+        addSourceFile(rc_file, QMakeSourceFileInfo::SEEK_DEPS);
+        const QStringList rcDeps = QStringList(rc_file) << dependencies(rc_file);
+
         // The resource tool may use defines. This might be the same defines passed in as the
         // compiler, since you may use these defines in the .rc file itself.
         // As the escape syntax for the command line defines for RC is different from that for CL,
@@ -680,7 +681,8 @@ void Win32MakefileGenerator::writeRcFilePart(QTextStream &t)
         // Also, we need to add the _DEBUG define manually since the compiler defines this symbol
         // by itself, and we use it in the automatically created rc file when VERSION is defined
         // in the .pro file.
-        t << escapeDependencyPath(res_file) << ": " << escapeDependencyPath(rc_file) << "\n\t"
+        t << escapeDependencyPath(res_file) << ": "
+          << escapeDependencyPaths(rcDeps).join(' ') << "\n\t"
           << var("QMAKE_RC") << (project->isActiveConfig("debug") ? " -D_DEBUG" : "")
           << defines << incPathStr << " -fo " << escapeFilePath(res_file)
           << ' ' << escapeFilePath(rc_file);
@@ -815,4 +817,9 @@ QString Win32MakefileGenerator::getManifestFileForRcFile() const
     return QString();
 }
 
+ProKey Win32MakefileGenerator::fullTargetVariable() const
+{
+    return "DEST_TARGET";
+}
+
 QT_END_NAMESPACE