diff options
| author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-06-12 15:07:41 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-06-15 10:07:50 +0000 |
| commit | 162334916bb87feaa6285f9916c87c541615da35 (patch) | |
| tree | c93cf8bd33eb658090531d150bb8b972ad7b30c1 | |
| parent | 3bd5fe5ebfe07e298d6b6d759090239567d78f08 (diff) | |
| download | qttools-162334916bb87feaa6285f9916c87c541615da35.tar.gz qttools-162334916bb87feaa6285f9916c87c541615da35.tar.bz2 qttools-162334916bb87feaa6285f9916c87c541615da35.zip | |
windeployqt: Fix broken deployment of ANGLE.
Commit 48b5cb2e682fd58e60b5650366c0291020e8b264 (windeployqt: Add support
for x86 based WinCE) broke the if condition as revealed by g++:
main.cpp: In function 'DeployResult deploy(const Options&, const QMap<QString, QString>&, QString*)':
main.cpp:1189:77: warning: 'and' of mutually exclusive equal-tests is always 0
if ((options.platform & WindowsBased) && !(options.platform & WinCEIntel) && !(options.platform & WinCEArm) && !qtGuiLibrary.isEmpty()) {
Change-Id: I91e8d4b93b1060330bff883f5eaa4eacc27e474f
Reviewed-by: Tobias Koenig <tobias.koenig@kdab.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| -rw-r--r-- | src/windeployqt/main.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp index 7f9f6c7f..8414a9af 100644 --- a/src/windeployqt/main.cpp +++ b/src/windeployqt/main.cpp @@ -1186,7 +1186,8 @@ static DeployResult deploy(const Options &options, } // Check for ANGLE on the Qt5Gui library. - if ((options.platform & WindowsBased) && !(options.platform & WinCEIntel) && !(options.platform & WinCEArm) && !qtGuiLibrary.isEmpty()) { + if ((options.platform & WindowsBased) && options.platform != WinCEIntel + && options.platform != WinCEArm && !qtGuiLibrary.isEmpty()) { QString libGlesName = QStringLiteral("libGLESV2"); if (isDebug) libGlesName += QLatin1Char('d'); |