diff options
| author | Jani Heikkinen <jani.heikkinen@qt.io> | 2017-09-27 14:37:22 +0300 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-27 03:18:00 +0000 |
| commit | 72cc04772620ab7bfa65f5105bbffc2c9092c0bc (patch) | |
| tree | cf913773a73041c8d57ee94d79b6601ad9e04445 | |
| parent | 1376f16f3bd9e3f9c5cae536e209f11c368982ae (diff) | |
Fix QNX platform configurations for Qt 5.9
With Qt 5.9 series we still deliver binaries for QNX 6.6 only ->
- Add QNX 6.6 platform configurations for windows
- Remove 'packaging' flag from QNX 7.0 builds
- Add provisioning script to patch QNX in windows 10 as well
This change fixes the previous 5.6 merge, where this should've happened.
Change-Id: Icf080fa5614371627f8f5245675cb190ebaaf893
Reviewed-by: Simo Fält <simo.falt@qt.io>
| -rw-r--r-- | coin/platform_configs/qt5.txt | 10 | ||||
| -rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/patch_qnx.ps1 | 1 |
2 files changed, 7 insertions, 4 deletions
diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 5eea413c..21c00e9d 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -16,8 +16,10 @@ qtci-macos-10.12-x86_64-8 Android_ANY armv7 GCC Packagin qtci-macos-10.12-x86_64-8 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 qtci-linux-RHEL-6.6-x86_64 QNX_660 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static -qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 QNX_700 x86 Mingw53 Packaging Release DisableTests OpenGLES2 -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 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw53 Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 QNX_700 x86 Mingw53 Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 QNX_660 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 QNX_660 x86 Mingw53 Packaging Release DisableTests OpenGLES2 +qtci-linux-RHEL-7.4-x86_64 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.4-x86_64 QNX_700 armv7 GCC Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-RHEL-7.4-x86_64 INTEGRITY_11_04 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/provisioning/qtci-windows-10-x86_64/patch_qnx.ps1 b/coin/provisioning/qtci-windows-10-x86_64/patch_qnx.ps1 new file mode 100644 index 00000000..41210dcb --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/patch_qnx.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\patch_qnx.ps1" |