diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-11 13:15:25 +0100 |
|---|---|---|
| committer | Tony Sarajärvi <tony.sarajarvi@qt.io> | 2018-01-14 08:59:49 +0000 |
| commit | 1c7ba877cc57924d8a4b30007d29dc06cd8af62e (patch) | |
| tree | f4c9f8042aed961e290f4ecca096e6670475afc2 | |
| parent | 6e4f2f84330dfaf272449a3e58810216385bd32a (diff) | |
Move QNX 7 arm build from qt5 to default
QNX 6.6 builds were removed. We need to check QNX in submodules
build.
This change amends 357de3ea1343d8bfbc2ec71d743e5981c396ca4f.
Change-Id: Ia04256bf35e45f111f73661c6f3ca445253900ec
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| -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 e746c641..73e668b4 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -23,3 +23,4 @@ qtci-linux-Ubuntu-16.04-x86_64-2 QEMU armv7 GCC qtci-linux-Ubuntu-16.04-x86_64-2 QEMU arm64 GCC Release qtci-linux-Ubuntu-16.04-x86_64-2 GCC TestOnly LicenseCheck qtci-linux-RHEL-7.4-x86_64 INTEGRITY_11_04 armv7 GCC Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.4-x86_64 QNX_700 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 95b13977..c951e920 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -19,4 +19,3 @@ qtci-macos-10.12-x86_64-8 WatchOS_ANY multi Clang DebugAnd 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 |