diff options
Diffstat (limited to 'qmake/generators/win32/winmakefile.cpp')
| -rw-r--r-- | qmake/generators/win32/winmakefile.cpp | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp index 2fb1fb952b..bda035e023 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -453,6 +453,7 @@ void Win32MakefileGenerator::processRcFileVar() ts << "\t\t\t\tVALUE \"LegalCopyright\", \"" << copyright << "\\0\"" << endl; ts << "\t\t\t\tVALUE \"OriginalFilename\", \"" << originalName << "\\0\"" << endl; ts << "\t\t\t\tVALUE \"ProductName\", \"" << productName << "\\0\"" << endl; + ts << "\t\t\t\tVALUE \"ProductVersion\", \"" << versionString << "\\0\"" << endl; ts << "\t\t\tEND" << endl; ts << "\t\tEND" << endl; ts << "\t\tBLOCK \"VarFileInfo\"" << endl; @@ -461,10 +462,6 @@ void Win32MakefileGenerator::processRcFileVar() << QString("0x%1").arg(rcLang, 4, 16, QLatin1Char('0')) << ", " << QString("%1").arg(rcCodePage, 4) << endl; ts << "\t\tEND" << endl; - ts << "\t\tBLOCK \"VarFileInfo\"" << endl; - ts << "\t\tBEGIN" << endl; - ts << "\t\t\tVALUE \"Translation\", 0x409, 1200" << endl; - ts << "\t\tEND" << endl; ts << "\tEND" << endl; ts << "/* End of Version info */" << endl; ts << endl; @@ -744,7 +741,7 @@ void Win32MakefileGenerator::writeLibsPart(QTextStream &t) t << "LIBAPP = " << var("QMAKE_LIB") << endl; t << "LIBFLAGS = " << var("QMAKE_LIBFLAGS") << endl; } else { - t << "LINK = " << var("QMAKE_LINK") << endl; + t << "LINKER = " << var("QMAKE_LINK") << endl; t << "LFLAGS = " << var("QMAKE_LFLAGS") << endl; t << "LIBS = " << var("QMAKE_LIBS") << " " << var("QMAKE_LIBS_PRIVATE") << endl; } @@ -782,8 +779,20 @@ void Win32MakefileGenerator::writeRcFilePart(QTextStream &t) // use these defines in the .rc file itself. 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 define the .pro file. + + const ProStringList rcIncPaths = project->values("RC_INCLUDEPATH"); + QString incPathStr; + for (int i = 0; i < rcIncPaths.count(); ++i) { + const ProString &path = rcIncPaths.at(i); + if (path.isEmpty()) + continue; + incPathStr += QStringLiteral(" /i "); + incPathStr += escapeFilePath(path); + } + t << res_file << ": " << rc_file << "\n\t" - << var("QMAKE_RC") << (project->isActiveConfig("debug") ? " -D_DEBUG" : "") << " $(DEFINES) -fo " << res_file << " " << rc_file; + << var("QMAKE_RC") << (project->isActiveConfig("debug") ? " -D_DEBUG" : "") + << " $(DEFINES)" << incPathStr << " -fo " << res_file << " " << rc_file; t << endl << endl; } } |