From 72cc04772620ab7bfa65f5105bbffc2c9092c0bc Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Wed, 27 Sep 2017 14:37:22 +0300 Subject: Fix QNX platform configurations for Qt 5.9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With Qt 5.9 series we still deliver binaries for QNX 6.6 only -> - Add QNX 6.6 platform configurations for windows - Remove 'packaging' flag from QNX 7.0 builds - Add provisioning script to patch QNX in windows 10 as well This change fixes the previous 5.6 merge, where this should've happened. Change-Id: Icf080fa5614371627f8f5245675cb190ebaaf893 Reviewed-by: Simo Fält --- coin/platform_configs/qt5.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'coin/platform_configs') diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 5eea413c..21c00e9d 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -16,8 +16,10 @@ qtci-macos-10.12-x86_64-8 Android_ANY armv7 GCC Packagin 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-macos-10.12-x86_64-8 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static -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 +qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw53 Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 QNX_700 x86 Mingw53 Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 QNX_660 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 QNX_660 x86 Mingw53 Packaging Release DisableTests OpenGLES2 +qtci-linux-RHEL-7.4-x86_64 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.4-x86_64 QNX_700 armv7 GCC Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-RHEL-7.4-x86_64 INTEGRITY_11_04 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -- cgit v1.2.3