aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeikki Halmet <heikki.halmet@qt.io>2021-08-19 08:35:46 +0300
committerHeikki Halmet <heikki.halmet@qt.io>2021-08-23 12:13:03 +0300
commitcca8ac0023a9449da97058dc12399494012fc465 (patch)
treebab08620746a22332068b73f5a14f2d99e2935d8
parent426bab28a81a17dd5feb70e9558f6edba610d17c (diff)
Remove Insignificant flags from Rhel 8.4 targets
Task-number: QTQAINFRA-4516 Change-Id: Ib508de80d6cb22c5d3a8a5faf2b9614355053827 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
-rw-r--r--coin/platform_configs/flashing-wizard.yaml2
-rw-r--r--coin/platform_configs/qt-creator.yaml2
-rw-r--r--coin/platform_configs/qtbase.yaml2
-rw-r--r--coin/platform_configs/qtsaferenderer.yaml2
4 files changed, 4 insertions, 4 deletions
diff --git a/coin/platform_configs/flashing-wizard.yaml b/coin/platform_configs/flashing-wizard.yaml
index 969e8500..5c4d074d 100644
--- a/coin/platform_configs/flashing-wizard.yaml
+++ b/coin/platform_configs/flashing-wizard.yaml
@@ -20,7 +20,7 @@ Configurations:
-
Template: 'qtci-linux-RHEL-8.4-x86_64-50'
Compiler: 'GCC'
- Features: ['Packaging', 'UseLegacyInstructions', Insignificant]
+ Features: ['Packaging', 'UseLegacyInstructions']
Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -openssl -qt-harfbuzz QMAKE_LFLAGS_APP+=-s -static -no-icu'
-
Template: 'qtci-linux-Ubuntu-18.04-x86_64-50'
diff --git a/coin/platform_configs/qt-creator.yaml b/coin/platform_configs/qt-creator.yaml
index befb66ce..af0cbffd 100644
--- a/coin/platform_configs/qt-creator.yaml
+++ b/coin/platform_configs/qt-creator.yaml
@@ -24,7 +24,7 @@ Configurations:
-
Template: 'qtci-linux-RHEL-8.4-x86_64-50'
Compiler: 'GCC'
- Features: ['Packaging', 'Sccache', 'DisableTests', 'Insignificant']
+ Features: ['Packaging', 'Sccache', 'DisableTests']
Configure arguments: ''
Environment variables: []
-
diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml
index 27b88c4d..088fbee5 100644
--- a/coin/platform_configs/qtbase.yaml
+++ b/coin/platform_configs/qtbase.yaml
@@ -24,7 +24,7 @@ Configurations:
Compiler: 'GCC'
Target compiler: 'Clang'
Platform dependency: 'RHEL-8.4-host'
- Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'Insignificant']
+ Features: ['Packaging', 'Sccache', 'AndroidTestRun']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml
index 016b764f..fd2f1508 100644
--- a/coin/platform_configs/qtsaferenderer.yaml
+++ b/coin/platform_configs/qtsaferenderer.yaml
@@ -20,7 +20,7 @@ Configurations:
-
Template: 'qtci-linux-RHEL-8.4-x86_64-50'
Compiler: 'GCC'
- Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions', 'Insignificant']
+ Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-icu -no-fontconfig -qt-freetype -no-opengl -qpa offscreen -no-xcb -qt-libpng -no-vulkan'
-
Template: 'qtci-linux-Ubuntu-18.04-x86_64-50'