diff options
| author | Maurice Kalinowski <maurice.kalinowski@theqtcompany.com> | 2016-01-04 15:27:16 +0100 |
|---|---|---|
| committer | Maurice Kalinowski <maurice.kalinowski@theqtcompany.com> | 2016-01-05 13:05:00 +0000 |
| commit | e0cc6e5b8e1be3ce292060d3b0f7f92e1bde82c1 (patch) | |
| tree | 50b847eb84c6450f63d03867c1eb5888087e7927 /qmake | |
| parent | 3c086e50d36f4cba566ed366bc546744372aec40 (diff) | |
winphone: Invoke windeployqt twice unconditionally for vcproj
In 50bf54c invoking windeployqt was only required in release mode as
MDILXapCompile was not invoked for debug builds with Visual Studio 2013.
However, Visual Studio 2015 invokes MDILXapCompile for debug and
release. Hence we have to use this workaround unconditionally.
Also we cannot limit this to msvc2015 host specs only, as older projects
still might be loaded with Visual Studio 2015 causing the build to
break.
Task-number: QTBUG-49815
Change-Id: Ia120a392967319b945a9746ad489f2db0eed7156
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index 1e187075c8..465c8fc312 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -1428,11 +1428,11 @@ void VcprojGenerator::initWinDeployQtTool() // itself contains the original subdirectories as parameters and hence the // call fails. // Neither there is a way to disable this behavior for Windows Phone, nor - // to influence the parameters. Hence the only way to get a release build + // to influence the parameters. Hence the only way to get a build // done is to recreate the directory structure manually by invoking // windeployqt a second time, so that the MDILXapCompile call succeeds and // deployment continues. - if (conf.WinPhone && conf.Name == QStringLiteral("Release|ARM")) { + if (conf.WinPhone) { conf.windeployqt.CommandLine = commandLine + QStringLiteral(" -list relative -dir \"$(MSBuildProjectDirectory)\\") + var("OBJECTS_DIR") |