From 48b5cb2e682fd58e60b5650366c0291020e8b264 Mon Sep 17 00:00:00 2001 From: Tobias Koenig Date: Tue, 2 Jun 2015 11:43:30 +0200 Subject: [PATCH] windeployqt: Add support for x86 based WinCE MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Adapt windeployqt to support x86 based WinCE systems in parallel to arm based WinCE systems. Change-Id: I855db447524ebc55c68af5eaecbf9f6a448d9ed8 Reviewed-by: Friedemann Kleint Reviewed-by: Andreas Holzammer Reviewed-by: Björn Breitmeyer --- src/windeployqt/main.cpp | 15 ++++++++++----- src/windeployqt/utils.h | 3 ++- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp index f1b4b39..a993765 100644 --- a/src/windeployqt/main.cpp +++ b/src/windeployqt/main.cpp @@ -196,8 +196,12 @@ static Platform platformFromMkSpec(const QString &xSpec) return WinPhoneIntel; if (xSpec.startsWith(QLatin1String("winphone-arm"))) return WinPhoneArm; - if (xSpec.startsWith(QLatin1String("wince"))) - return WinCE; + if (xSpec.startsWith(QLatin1String("wince"))) { + if (xSpec.contains(QLatin1String("-x86-"))) + return WinCEIntel; + if (xSpec.contains(QLatin1String("-arm"))) + return WinCEArm; + } return UnknownPlatform; } @@ -789,7 +793,8 @@ QStringList findQtPlugins(quint64 *usedQtModules, quint64 disabledQtModules, switch (platform) { case Windows: case WindowsMinGW: - case WinCE: + case WinCEIntel: + case WinCEArm: filter = QStringLiteral("qwindows"); break; case WinRtIntel: @@ -1179,13 +1184,13 @@ static DeployResult deploy(const Options &options, } // Check for ANGLE on the Qt5Gui library. - if ((options.platform & WindowsBased) && !qtGuiLibrary.isEmpty()) { + if ((options.platform & WindowsBased) && !(options.platform & WinCEIntel) && !(options.platform & WinCEArm) && !qtGuiLibrary.isEmpty()) { QString libGlesName = QStringLiteral("libGLESV2"); if (isDebug) libGlesName += QLatin1Char('d'); libGlesName += QLatin1String(windowsSharedLibrarySuffix); const QStringList guiLibraries = findDependentLibraries(qtGuiLibrary, options.platform, errorMessage); - const bool dependsOnAngle = !guiLibraries.filter(libGlesName, Qt::CaseInsensitive).isEmpty() && !(options.platform & WinCE); + const bool dependsOnAngle = !guiLibraries.filter(libGlesName, Qt::CaseInsensitive).isEmpty(); const bool dependsOnOpenGl = !guiLibraries.filter(QStringLiteral("opengl32"), Qt::CaseInsensitive).isEmpty(); if (options.angleDetection != Options::AngleDetectionForceOff && (dependsOnAngle || !dependsOnOpenGl || options.angleDetection == Options::AngleDetectionForceOn)) { diff --git a/src/windeployqt/utils.h b/src/windeployqt/utils.h index 76e003a..e7c2776 100644 --- a/src/windeployqt/utils.h +++ b/src/windeployqt/utils.h @@ -62,7 +62,8 @@ enum Platform { WinRtArm = WindowsBased + ArmBased + 2, WinPhoneIntel = WindowsBased + IntelBased + 3, WinPhoneArm = WindowsBased + ArmBased + 4, - WinCE = WindowsBased + ArmBased + 5, + WinCEIntel = WindowsBased + IntelBased + 5, + WinCEArm = WindowsBased + ArmBased + 6, Unix = UnixBased, UnknownPlatform }; -- 2.7.4