diff options
| author | Ville Voutilainen <ville.voutilainen@qt.io> | 2021-03-09 10:35:37 +0200 |
|---|---|---|
| committer | Ville Voutilainen <ville.voutilainen@qt.io> | 2021-03-23 06:10:27 +0000 |
| commit | c22c94a17e854bc3a88bbd3c12e4a40271e51502 (patch) | |
| tree | fb02d16abc240472220aff4583f7c2a64bdfa496 /tests/postbuild | |
| parent | 033a7d0f69966c4755413597f140707d06e51d4c (diff) | |
In Qt6, bic test needs to compile code in C++17 mode
Change-Id: I2f66d6ad0c18535721b761cabc264fc57734bf3c
Pick-to: master
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'tests/postbuild')
| -rwxr-xr-x | tests/postbuild/bic/gen.sh | 2 | ||||
| -rw-r--r-- | tests/postbuild/bic/tst_bic.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/postbuild/bic/gen.sh b/tests/postbuild/bic/gen.sh index f91cb77c..dd148988 100755 --- a/tests/postbuild/bic/gen.sh +++ b/tests/postbuild/bic/gen.sh @@ -51,7 +51,7 @@ fi for module in $modules; do echo "#include <$module/$module>" >test.cpp - g++ -c -std=c++11 -I$QTDIR/include -DQT_NO_STL $DUMP_CMDLINE -fPIC test.cpp + g++ -c -std=c++17 -I$QTDIR/include -DQT_NO_STL $DUMP_CMDLINE -fPIC test.cpp mv test.cpp*.class $module.$2.txt # Remove template classes from the output perl -pi -e '$skip = 1 if (/^(Class|Vtable).*</); diff --git a/tests/postbuild/bic/tst_bic.cpp b/tests/postbuild/bic/tst_bic.cpp index b2e12933..0110ad1c 100644 --- a/tests/postbuild/bic/tst_bic.cpp +++ b/tests/postbuild/bic/tst_bic.cpp @@ -112,7 +112,7 @@ static QStringList compilerArguments(const QString &compiler, const QStringList #else << "-fdump-class-hierarchy" #endif - << "-std=c++11" + << "-std=c++17" << "-fPIC"; // As of 5.4, "reduce relocations" requires "-fPIC" return result; } |