diff options
| author | Andrew Knight <andrew.knight@digia.com> | 2014-02-11 14:55:43 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-11 18:53:10 +0100 |
| commit | 2a9944e281ba3c4d81f036ea0760c1850fd5c837 (patch) | |
| tree | 6409b748c318c5211944c2517c4df88996df422a /qmake | |
| parent | 062d2a1f801a03db09db23763f024bd0397305a0 (diff) | |
WinRT qmake vcproj: Fix icon locator
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>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/win32/msbuild_objectmodel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/win32/msbuild_objectmodel.cpp b/qmake/generators/win32/msbuild_objectmodel.cpp index 4f946001bf..7702496f3c 100644 --- a/qmake/generators/win32/msbuild_objectmodel.cpp +++ b/qmake/generators/win32/msbuild_objectmodel.cpp @@ -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)"); |