diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-09-18 09:20:32 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-09-18 09:42:25 +0200 |
| commit | e7472f43087921c3d83ff4452bbdb67ed27ed604 (patch) | |
| tree | 09565f89d0e5b5a702b532b103fe677c1b13edba /coin/platform_configs | |
| parent | 92d1bdcb43e988919bfdcb91c0e6f366bed07145 (diff) | |
| parent | 12fd0d5b9b486eaf80712d390265402a3bb06f0e (diff) | |
Merge remote-tracking branch 'origin/5.6.3' into 5.6
Conflicts:
.gitmodules
Change-Id: I3f5310cfb9b839e622ab606fd674a58d50515c0c
Diffstat (limited to 'coin/platform_configs')
| -rw-r--r-- | coin/platform_configs/qt5.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index b9565ebe..92d55b1f 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -9,6 +9,8 @@ qtci-windows-7-x86-2 Android_ANY x86 Mingw49 Packagin qtci-osx-10.11-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 qtci-osx-10.11-x86_64 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-windows-10-x86_64-7 QNX_660 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-7 QNX_660 x86 Mingw53 Packaging Release DisableTests OpenGLES2 # target arch is used here only for documentation the value is ignored qtci-windows-10-x86_64-8 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release DisableTests UploadConfigureExe |