From 2a9944e281ba3c4d81f036ea0760c1850fd5c837 Mon Sep 17 00:00:00 2001 From: Andrew Knight Date: Tue, 11 Feb 2014 14:55:43 +0200 Subject: 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 --- qmake/generators/win32/msbuild_objectmodel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qmake/generators/win32/msbuild_objectmodel.cpp') 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 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)"); -- cgit v1.2.3