diff options
Diffstat (limited to 'qmake/generators/win32/winmakefile.cpp')
| -rw-r--r-- | qmake/generators/win32/winmakefile.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp index 57f02c13d0..85cc1ffd8a 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -301,7 +301,7 @@ void Win32MakefileGenerator::processRcFileVar() if (Option::qmake_mode == Option::QMAKE_GENERATE_NOTHING) return; - const QString manifestFile = getManifestFileForRcFile(); + const QString manifestFile = project->first("QMAKE_MANIFEST").toQString(); if (((!project->values("VERSION").isEmpty() || !project->values("RC_ICONS").isEmpty() || !manifestFile.isEmpty()) && project->values("RC_FILE").isEmpty() && project->values("RES_FILE").isEmpty() @@ -878,11 +878,6 @@ QString Win32MakefileGenerator::cQuoted(const QString &str) return ret; } -QString Win32MakefileGenerator::getManifestFileForRcFile() const -{ - return QString(); -} - ProKey Win32MakefileGenerator::fullTargetVariable() const { return "DEST_TARGET"; |