diff options
Diffstat (limited to 'qt_cmdline.cmake')
-rw-r--r-- | qt_cmdline.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/qt_cmdline.cmake b/qt_cmdline.cmake index ce7919709e..a30031135d 100644 --- a/qt_cmdline.cmake +++ b/qt_cmdline.cmake @@ -11,8 +11,6 @@ qt_commandline_subconfig(src/printsupport) qt_commandline_subconfig(src/plugins/sqldrivers) qt_commandline_subconfig(src/testlib) qt_commandline_subconfig(src/tools) -# no-prefix needs to be placed before prefix -qt_commandline_option(no-prefix TYPE void) qt_commandline_option(prefix TYPE string) qt_commandline_option(extprefix TYPE string) qt_commandline_option(archdatadir TYPE string) @@ -54,7 +52,6 @@ qt_commandline_option(dbus-linked TYPE void NAME dbus VALUE linked) qt_commandline_option(dbus-runtime TYPE void NAME dbus VALUE runtime) qt_commandline_option(debug TYPE void) qt_commandline_option(debug-and-release TYPE boolean NAME debug_and_release) -qt_commandline_option(developer-build TYPE void) qt_commandline_option(device TYPE string) qt_commandline_option(device-option TYPE addString) qt_commandline_option(f16c TYPE boolean) @@ -144,7 +141,10 @@ function(qt_commandline_cxxstd arg val nextok) qtConfAddError("Missing argument to command line parameter '${arg}'.") return() endif() - if(val MATCHES "(c\\+\\+)?(20|2a)") + if(val MATCHES "(c\\+\\+)?(17|1z)") + qtConfCommandlineDisableFeature(c++20) + qtConfCommandlineDisableFeature(c++2b) + elseif(val MATCHES "(c\\+\\+)?(20|2a)") qtConfCommandlineEnableFeature(c++20) qtConfCommandlineDisableFeature(c++2b) elseif(val MATCHES "(c\\+\\+)?(2b)") |