diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-05-04 12:56:14 +0200 |
---|---|---|
committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2017-05-05 04:48:42 +0000 |
commit | 15db04e57cf8bcc2ba2fa3248a2928b23f4667ab (patch) | |
tree | 3141fef642b8925189d1968538f2d001502eda69 | |
parent | e44e967d0c5f545473490e893db628509a5417fe (diff) | |
download | qttools-15db04e57cf8bcc2ba2fa3248a2928b23f4667ab.tar.gz |
Revert "windeployqt: Remove deployment of libglesv2 and libegl"v5.9.0-beta4
Bring back the autodetection of ANGLE as the naming
now depends on configure switches.
This reverts commit fc8b7d36291611aebdc344f2e26a992da0003bbc.
Task-number: QTBUG-60373
Change-Id: I14826cd1730fddb203e9a7c98b76d7def7388d9c
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
-rw-r--r-- | src/windeployqt/main.cpp | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp index d76ba774a..4f14b4cd0 100644 --- a/src/windeployqt/main.cpp +++ b/src/windeployqt/main.cpp @@ -1325,17 +1325,32 @@ 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()) { + QString libGlesName = QStringLiteral("libGLESV2"); + if (isDebug) + libGlesName += QLatin1Char('d'); + libGlesName += QLatin1String(windowsSharedLibrarySuffix); QString libQtAngleName = QStringLiteral("QtANGLE"); if (isDebug) libQtAngleName += QLatin1Char('d'); libQtAngleName += QLatin1String(windowsSharedLibrarySuffix); const QStringList guiLibraries = findDependentLibraries(qtGuiLibrary, options.platform, errorMessage); - const bool dependsOnAngle = !guiLibraries.filter(libQtAngleName, Qt::CaseInsensitive).isEmpty(); + const bool dependsOnAngle = !guiLibraries.filter(libGlesName, Qt::CaseInsensitive).isEmpty(); + const bool dependsOnNewAngle = !guiLibraries.filter(libQtAngleName, Qt::CaseInsensitive).isEmpty(); const bool dependsOnOpenGl = !guiLibraries.filter(QStringLiteral("opengl32"), Qt::CaseInsensitive).isEmpty(); if (options.angleDetection != Options::AngleDetectionForceOff - && (dependsOnAngle || !dependsOnOpenGl || options.angleDetection == Options::AngleDetectionForceOn)) { - const QString libQtAngleFullPath = qtBinDir + slash + libQtAngleName; - deployedQtLibraries.append(libQtAngleFullPath); + && (dependsOnAngle || dependsOnNewAngle || !dependsOnOpenGl || options.angleDetection == Options::AngleDetectionForceOn)) { + if (dependsOnNewAngle) { + const QString libQtAngleFullPath = qtBinDir + slash + libQtAngleName; + deployedQtLibraries.append(libQtAngleFullPath); + } else { + const QString libGlesFullPath = qtBinDir + slash + libGlesName; + deployedQtLibraries.append(libGlesFullPath); + QString libEglFullPath = qtBinDir + slash + QStringLiteral("libEGL"); + if (isDebug) + libEglFullPath += QLatin1Char('d'); + libEglFullPath += QLatin1String(windowsSharedLibrarySuffix); + deployedQtLibraries.append(libEglFullPath); + } // Find the system D3d Compiler matching the D3D library. if (options.systemD3dCompiler && !options.isWinRt()) { const QString d3dCompiler = findD3dCompiler(options.platform, qtBinDir, wordSize); |