diff options
| author | Andreas Holzammer <andreas.holzammer@kdab.com> | 2016-03-22 07:28:38 +0100 |
|---|---|---|
| committer | Andreas Holzammer <andreas.holzammer@kdab.com> | 2016-03-22 14:10:03 +0000 |
| commit | f8d790f086c2531f5437023a8188b4b4f07f6c31 (patch) | |
| tree | 022ad9c4561c53a6a9bdda3e18a5495883cb7cc0 /tools | |
| parent | dfb9b9e1f7ff723bbb082875962ddcf0d69d1db2 (diff) | |
qmake: Fix wince dll deployment in Visual Studio
This fix repairs the mechanism to deploy Qt dlls as well as C++ runtime
to a wince target in Visual Studio.
Do this by adding a deploy section in the Visual Studio solution and
adding the C++ runtime from the mkspec to the files deployed to the target.
Deploy target path is set to what the wizard of Visual Studio defaults to.
Before, the c++ runtime was only deployed for executables which were built
as part of Qt.
Task-number: QTBUG-50924
Change-Id: I478010dc16e35c68578281895aa3ae14b5c96bb4
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 418426b027..b599df45e3 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -3176,9 +3176,6 @@ void Configure::generateCachefile() moduleStream << "QT_CE_RAPI_LIB = " << formatPath(dictionary["QT_CE_RAPI_LIB"]) << endl; } - moduleStream << "#Qt for Windows CE c-runtime deployment" << endl - << "QT_CE_C_RUNTIME = " << formatPath(dictionary["CE_CRT"]) << endl; - if (dictionary["CE_SIGNATURE"] != QLatin1String("no")) moduleStream << "DEFAULT_SIGNATURE=" << dictionary["CE_SIGNATURE"] << endl; @@ -3594,6 +3591,11 @@ void Configure::generateQConfigPri() << "QT_GCC_PATCH_VERSION = " << dictionary["QT_GCC_PATCH_VERSION"] << endl; } + if (dictionary.value("XQMAKESPEC").startsWith("wince")) { + configStream << "#Qt for Windows CE c-runtime deployment" << endl + << "QT_CE_C_RUNTIME = " << formatPath(dictionary["CE_CRT"]) << endl; + } + if (!configStream.flush()) dictionary[ "DONE" ] = "error"; } |