diff options
| -rw-r--r-- | coin/platform_configs/qt5.txt | 6 | ||||
| -rw-r--r-- | coin/provisioning/common/windows/msys.ps1 (renamed from coin/provisioning/qtci-windows-7-x86/04-msys.ps1) | 2 | ||||
| -rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/04-msys.ps1 | 1 | ||||
| -rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/10-openssl_for_android.ps1 (renamed from coin/provisioning/qtci-windows-7-x86/31-android_openssl.ps1) | 0 | ||||
| -rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/40-android.ps1 (renamed from coin/provisioning/qtci-windows-7-x86/30-android.ps1) | 0 |
5 files changed, 5 insertions, 4 deletions
diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 37065eff..88d3cf4a 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -8,9 +8,9 @@ qtci-windows-10-x86_64-10 Mingw73 qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-windows-7-x86-3 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2 -qtci-windows-7-x86-3 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2 -qtci-windows-7-x86-3 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2 qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2 qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2 diff --git a/coin/provisioning/qtci-windows-7-x86/04-msys.ps1 b/coin/provisioning/common/windows/msys.ps1 index 24d7a5ca..df67cc20 100644 --- a/coin/provisioning/qtci-windows-7-x86/04-msys.ps1 +++ b/coin/provisioning/common/windows/msys.ps1 @@ -1,4 +1,4 @@ -. "$PSScriptRoot\..\common\windows\helpers.ps1" +. "$PSScriptRoot\helpers.ps1" # This script will install msys which is needed for configuring openssl for Android diff --git a/coin/provisioning/qtci-windows-10-x86_64/04-msys.ps1 b/coin/provisioning/qtci-windows-10-x86_64/04-msys.ps1 new file mode 100644 index 00000000..44efea92 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/04-msys.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\msys.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/31-android_openssl.ps1 b/coin/provisioning/qtci-windows-10-x86_64/10-openssl_for_android.ps1 index 25c6f28a..25c6f28a 100644 --- a/coin/provisioning/qtci-windows-7-x86/31-android_openssl.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/10-openssl_for_android.ps1 diff --git a/coin/provisioning/qtci-windows-7-x86/30-android.ps1 b/coin/provisioning/qtci-windows-10-x86_64/40-android.ps1 index 69799974..69799974 100644 --- a/coin/provisioning/qtci-windows-7-x86/30-android.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/40-android.ps1 |