diff options
| author | Andrew Knight <andrew.knight@digia.com> | 2014-03-27 10:04:17 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-31 17:46:19 +0200 |
| commit | f9d03fc1f5a775c1b57f138f4d2ba5b9cdaf2b97 (patch) | |
| tree | d1ae1e8c18bbe32ffe3689c46584d05ef0071adf | |
| parent | 51904a6637350ca37dbb9195916944122f2266ac (diff) | |
| download | qttools-f9d03fc1f5a775c1b57f138f4d2ba5b9cdaf2b97.tar.gz | |
windeployqt: Disable d3dcompiler deployment on WinRT
This is no longer necessary for WinRT 8.1, because d3dcompiler_qt links
directly to the d3dcompiler.
Change-Id: Ic1d1261e9d16290ca7d4c2c5305d04092674333e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.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 5634ff011..6ae6a3c6b 100644 --- a/src/windeployqt/main.cpp +++ b/src/windeployqt/main.cpp @@ -899,7 +899,8 @@ static DeployResult deploy(const Options &options, deployedQtLibraries.push_back(libGLESv2FullPath); } // Find the system D3d Compiler matching the D3D library. - if (options.systemD3dCompiler && options.platform != WinPhoneArm && options.platform != WinPhoneIntel) { + if (options.systemD3dCompiler && options.platform != WinPhoneArm && options.platform != WinPhoneIntel + && options.platform != WinRtArm && options.platform != WinRtIntel) { const QString d3dCompiler = findD3dCompiler(options.platform, qtBinDir, wordSize); if (d3dCompiler.isEmpty()) { std::wcerr << "Warning: Cannot find any version of the d3dcompiler DLL.\n"; |