From 7cc4b3400664ef495ae4c59bf0a9afffc3ce3d15 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Mon, 27 May 2024 11:47:26 +0200 Subject: [PATCH] Remove the -c++std c++17 from nightly ubuntu The flag does nothing for ages and the standard is enforced by default. Task-number: QTBUG-125015 Change-Id: I901c0bf58d91cb795d63c4769fb054eee5c5788a Reviewed-by: Joerg Bornemann (cherry picked from commit 9e4c4c5aaba225425568bd3429bca099f03caabc) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/nightly_ubuntu_20.04_c++17.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/nightly_ubuntu_20.04_c++17.yaml b/coin/platform_configs/nightly_ubuntu_20.04_c++17.yaml index 6bbe3739..b9d8864e 100644 --- a/coin/platform_configs/nightly_ubuntu_20.04_c++17.yaml +++ b/coin/platform_configs/nightly_ubuntu_20.04_c++17.yaml @@ -6,7 +6,7 @@ Configurations: Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Compiler: 'GCC' Features: ['Sccache', 'UseConfigure'] - Configure arguments: '-nomake examples -release -c++std c++17 -force-debug-info -separate-debug-info -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput' + Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput' Environment variables: [ 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DFEATURE_clangcpp=OFF -DINPUT_headersclean=ON'