diff options
author | Liang Qi <liang.qi@qt.io> | 2017-11-17 14:04:27 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-12-08 20:05:59 +0000 |
commit | 7d04dc1a291b1306be2dad2c27a1b11ae6c11b63 (patch) | |
tree | 17f0c590c53f21259920438c0c4ba7471a03c0fd /coin | |
parent | d9f2fe1b7f9b90815b4056c89ec2f670ff12180f (diff) |
Move INTEGRITY build from qt5 to default
Many failures in qtbase on INTEGRITY happened recently.
Change-Id: Ic55259e694961a53199d30f095159728207f8824
Reviewed-by: Kimmo Ollila <kimmo.ollila@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Diffstat (limited to 'coin')
-rw-r--r-- | coin/platform_configs/default.txt | 1 | ||||
-rw-r--r-- | coin/platform_configs/qt5.txt | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 0f047cdc..39f0373d 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -22,3 +22,4 @@ qtci-linux-Ubuntu-16.04-x86_64-1 QEMU armv7 GCC qtci-linux-Ubuntu-16.04-x86_64-1 QEMU arm64 GCC Release qtci-linux-Ubuntu-16.04-x86_64-1 GCC TestOnly LicenseCheck qtci-linux-RHEL-6.6-x86_64 QNX_660 armv7 GCC Packaging 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/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index d410c6aa..5282634a 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -22,4 +22,3 @@ qtci-windows-10-x86_64-10 QNX_660 armv7 Mingw53 Packagin 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 |