diff options
| author | Paolo Angelelli <paolo.angelelli@qt.io> | 2017-07-24 15:01:09 +0200 |
|---|---|---|
| committer | Paolo Angelelli <paolo.angelelli@qt.io> | 2017-07-26 14:11:29 +0000 |
| commit | 74fa40d9789b1f0b50051eb8c372f3c104b89b38 (patch) | |
| tree | 8d4d10e8dde2ef7882cb097cfd2c886aef5cf956 /coin/platform_configs | |
| parent | f56f2c20c4da182f6a979c418f7ba93d8d71694b (diff) | |
Replace QNX7 target with QNX6.6 for all Qt modules
Reason being that it's much easier to trigger compile errors with the
QNX6.6 toolchain than with the newer QNX7, so these show up at once
and not only at qt5.git integration.
Task-number: QTBUG-62047
Change-Id: Ib45728c92488206dbede019e4583bc9a5386b90f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'coin/platform_configs')
| -rw-r--r-- | coin/platform_configs/default.txt | 2 | ||||
| -rw-r--r-- | coin/platform_configs/qt5.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 7ee4df05..e2fbebd1 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -20,4 +20,4 @@ qtci-osx-10.10-x86_64 IOS_ANY x86_64 Clang qtci-linux-RHEL-7.2-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-Ubuntu-16.04-x86_64-1 Boot2Qt_Jethro armv7 GCC Release qtci-linux-Ubuntu-16.04-x86_64-1 GCC TestOnly LicenseCheck -qtci-linux-RHEL-7.2-x86_64 QNX_700 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-6.6-x86_64 QNX_660 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index fec2a44c..0b38af20 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -15,8 +15,8 @@ qtci-windows-7-x86-2 Android_ANY x86 Mingw53 Packagin qtci-macos-10.12-x86_64-8 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 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-linux-RHEL-6.6-x86_64 QNX_660 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-RHEL-7.2-x86_64 QNX_700 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.2-x86_64 QNX_700 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-windows-10-x86_64-7 QNX_700 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-7 QNX_700 x86 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-osx-10.10-x86_64 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static |