diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-06-12 21:36:03 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-06-12 21:36:03 +0200 |
| commit | 20113e48724e303e40f6930d44b0999e965ea67a (patch) | |
| tree | 7499419f896dd1504fff531a1bee3a18dc289bfc /coin/platform_configs | |
| parent | 9b0e908aca19d58a0d6b6eefebeb7e184437ada5 (diff) | |
| parent | 5bc43f0cc3cfe047dcdbe2a293f4ed6885d8a637 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.9
Conflicts:
coin/platform_configs/default.txt
coin/platform_configs/qt5.txt
Change-Id: I1709ddd14bf27186a8968ce073cf22e7903ff798
Diffstat (limited to 'coin/platform_configs')
| -rw-r--r-- | coin/platform_configs/default.txt | 4 | ||||
| -rw-r--r-- | coin/platform_configs/qt5.txt | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index ea7b25e5..fd29f907 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -16,8 +16,8 @@ qtci-linux-RHEL-6.6-x86_64 GCC qtci-linux-RHEL-7.2-x86_64 GCC Packaging Release NoUseGoldLinker qtci-macos-10.12-x86_64-8 Clang DebugAndRelease Release DisableTests qtci-osx-10.11-x86_64-3 Clang DeveloperBuild Release QtNamespace NoPch -qtci-osx-10.10-x86_64 Clang Packaging DebugAndRelease Release -qtci-osx-10.10-x86_64 Clang Release NoFramework +qtci-osx-10.10-x86_64 Clang Packaging DebugAndRelease Release DisableTests +qtci-osx-10.10-x86_64 Clang Release NoFramework DisableTests qtci-osx-10.10-x86_64 IOS_ANY x86_64 Clang Release DisableTests Static qtci-linux-RHEL-7.2-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-Ubuntu-16.04-x86_64 Boot2Qt_Jethro armv7 GCC Release diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 924a3bc2..efcdd620 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -15,8 +15,6 @@ qtci-macos-10.12-x86_64-8 Android_ANY x86 GCC Packagin 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-windows-7-x86-2 QNX_660 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 -qtci-windows-7-x86-2 QNX_660 x86 Mingw53 Packaging Release DisableTests OpenGLES2 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 |