diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-05-30 21:19:11 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-05-30 21:19:11 +0200 |
| commit | 0a2465bc307f6008630e9dbe847747c1886081ab (patch) | |
| tree | 1f8ed3e7c268bd5835be805b9041678910f77c92 /coin/platform_configs | |
| parent | feb12a86f8d8db8d755f5e4ecc64e63fe38ccb1a (diff) | |
| parent | e09cd7630f3932063363a6d53de71ff22473de02 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I7502e49bc75f84b7fb2d4534181a2082fc939265
Diffstat (limited to 'coin/platform_configs')
| -rw-r--r-- | coin/platform_configs/qt5.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index ddcd2d97..ae1f98ae 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -17,6 +17,6 @@ qtci-macos-10.12-x86_64-8 TvOS_ANY multi Clang DebugAnd 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 Mingw53 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 QNX_700 x86_64 Mingw53 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 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.4-x86_64 QNX_700 x86_64 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker |