1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WinRT qmake vcproj: Fix icon locator

Browse Source 
This was broken for shadow builds. Adding the output directory to the
manifest file name fixes the problem.

Change-Id: I9e5b47a08f80f7afcfd76e13784fbaec912e50ad
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Andrew Knight 2014-02-11 14:55:43 +02:00 committed by The Qt Project
parent 062d2a1f80
commit 2a9944e281
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qmake/generators/win32/msbuild_objectmodel.cpp
View File

@ -839,7 +839,7 @@ void VCXProjectWriter::write(XmlOutput &xml, VCProject &tool)
// Find all icons referenced in the manifest
QSet<QString> icons;
QFile manifestFile(manifest);
QFile manifestFile(Option::output_dir + QLatin1Char('/') + manifest);
if (manifestFile.open(QFile::ReadOnly)) {
const QString contents = manifestFile.readAll();
QRegExp regexp("[\\\\/a-zA-Z0-9_\\-\\!]*\\.(png|jpg|jpeg)");