aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@qt.io>2018-08-21 15:02:07 +0200
committerSimon Hausmann <simon.hausmann@qt.io>2018-08-23 09:28:56 +0000
commit1e9fb7f9d952b3db8935920ff8401efbd1ee6bd4 (patch)
treea121c508175cf4c7e54c92a3f431c5febf21eeb0
parent3dd549d61893e085e2eced4a44172b89cad9d47e (diff)
Prospective fix for build of qttools on Windows with QNX target
This modules contains qdoc as a host build tool, which needs to be built with MinGW 7.3 as host compiler in order for the libclang linkage to succeed. That linkage is forced via QDOC_USE_STATIC_LIBCLANG, which is set on the Windows 10 machine. Task-number: QTBUG-69793 Change-Id: I2f0ce81c58ae049d9d59559dfe4f457d082cc98d Reviewed-by: Simo Fält <simo.falt@qt.io>
-rw-r--r--coin/platform_configs/qt5.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt
index 72ec9b61..7f97f741 100644
--- a/coin/platform_configs/qt5.txt
+++ b/coin/platform_configs/qt5.txt
@@ -16,8 +16,8 @@ qtci-macos-10.12-x86_64-8 QNX_700 x86 GCC Release
qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static
qtci-macos-10.12-x86_64-8 TvOS_ANY multi Clang DebugAndRelease DisableTests
qtci-macos-10.12-x86_64-8 WatchOS_ANY multi Clang DebugAndRelease DisableTests
-qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw53 Packaging Release DisableTests OpenGLES2
-qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw53 Packaging Release DisableTests OpenGLES2
-qtci-windows-10-x86_64-10 QNX_700 x86_64 Mingw53 Packaging Release DisableTests OpenGLES2
+qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2
+qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2
+qtci-windows-10-x86_64-10 QNX_700 x86_64 Mingw73 Packaging Release DisableTests OpenGLES2
qtci-linux-RHEL-7.4-x86_64 QNX_700 armv8 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-linux-RHEL-7.4-x86_64 QNX_700 x86_64 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker