Linker Basisordner: d:\qt\4.7.4.org\qmake Rechter Basisordner: d:\qt\4.7.4\qmake --- generators\win32\winmakefile.cpp 2011-09-12 09:49:28.000000000 +0100 +++ generators\win32\winmakefile.cpp 2011-11-18 22:22:48.000000000 +0100 @@ -408,11 +408,18 @@ productName = project->values("QMAKE_TARGET_PRODUCT").join(" "); else productName = project->values("TARGET").first(); QString originalName = project->values("TARGET").first() + project->values("TARGET_EXT").first(); + int rcLang = 1033; // English(USA) + if (!project->values("RC_LANG").isEmpty()) + rcLang = project->values("RC_LANG").first().toInt(0,0); + int rcCodePage = 1200; //Unicode + if (!project->values("RC_CODEPAGE").isEmpty()) + rcCodePage = project->values("RC_CODEPAGE").first().toInt(0,0); ts << "# if defined(UNDER_CE)" << endl; ts << "# include " << endl; ts << "# else" << endl; ts << "# include " << endl; ts << "# endif" << endl; @@ -432,33 +439,39 @@ else ts << "\tFILETYPE VFT_APP" << endl; ts << "\tFILESUBTYPE 0x0L" << endl; ts << "\tBEGIN" << endl; ts << "\t\tBLOCK \"StringFileInfo\"" << endl; ts << "\t\tBEGIN" << endl; - ts << "\t\t\tBLOCK \"040904B0\"" << endl; + + ts << "\t\t\tBLOCK \"" << QString("%1%2").arg(rcLang,4,16,QChar('0')).arg(rcCodePage,4,16,QChar('0')) << "\"" << endl; ts << "\t\t\tBEGIN" << endl; ts << "\t\t\t\tVALUE \"CompanyName\", \"" << companyName << "\\0\"" << endl; ts << "\t\t\t\tVALUE \"FileDescription\", \"" << description << "\\0\"" << endl; ts << "\t\t\t\tVALUE \"FileVersion\", \"" << versionString << "\\0\"" << endl; 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; + ts << "\t\tBEGIN" << endl; + ts << "\t\t\tVALUE \"Translation\", " << QString("0x%1").arg(rcLang,4,16,QChar('0')) << ", " << QString("%1").arg(rcCodePage,4) << endl; ts << "\t\tEND" << endl; ts << "\tEND" << endl; ts << "/* End of Version info */" << endl; ts << endl; ts.flush(); QString rcFilename = project->values("OUT_PWD").first() + "/" + project->values("TARGET").first() - + "_resource" + + "_version" + ".rc"; QFile rcFile(QDir::cleanPath(rcFilename)); bool writeRcFile = true; if (rcFile.exists() && rcFile.open(QFile::ReadOnly)) { writeRcFile = rcFile.readAll() != rcString;