lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-23 05:16:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/5.6' into 5.9

Browse Source 
Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt

Change-Id: I1709ddd14bf27186a8968ce073cf22e7903ff798
This commit is contained in:
Simon Hausmann
2017-06-12 21:36:03 +02:00
parent 9b0e908aca 5bc43f0cc3
commit 20113e4872
21 changed files with 149 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coin/platform_configs/default.txt
View File

@@ -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

2
coin/platform_configs/qt5.txt
View File

@@ -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