AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configure: Remove vestiges of handling QMAKE_* variable assignments

Browse Source 
When qmake and CMake build were both available next to each other, we
answered QMAKE_FOO=bar assignments in the CMake build with an error
message.  This code is never triggered these days and can be removed.

Change-Id: Ifd29283b8ddc86b94c4e6cbce9e9252215e9f2fe
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Joerg Bornemann 2021-11-18 22:16:00 +01:00
parent 95907f9be4
commit a756a9aa8b
1 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
qt_cmdline.cmake
View File

@ -8,7 +8,6 @@ qt_commandline_subconfig(src/printsupport)
qt_commandline_subconfig(src/plugins/sqldrivers) qt_commandline_subconfig(src/plugins/sqldrivers)
qt_commandline_subconfig(src/testlib) qt_commandline_subconfig(src/testlib)
qt_commandline_subconfig(src/tools) qt_commandline_subconfig(src/tools)
qt_commandline_custom(qmakeArgs)
qt_commandline_option(prefix TYPE string) qt_commandline_option(prefix TYPE string)
qt_commandline_option(extprefix TYPE string) qt_commandline_option(extprefix TYPE string)
qt_commandline_option(archdatadir TYPE string) qt_commandline_option(archdatadir TYPE string)
@ -124,18 +123,6 @@ qt_commandline_prefix(L lpaths)
qt_commandline_prefix(R rpaths) qt_commandline_prefix(R rpaths)
qt_commandline_prefix(W wflags) qt_commandline_prefix(W wflags)
# special case begin
function(qt_commandline_qmakeArgs out_var arg)
if(arg MATCHES "^QMAKE_[A-Z0-9_]+ *[-+]?=.*")
message(FATAL_ERROR
"${arg} is not a valid configure argument. "
"Assignments to QMake variables are not supported. "
"Consider passing the equivalent CMake argument via "
"'configure ... -- -DCMAKE_VARIABLE=VALUE'")
endif()
set(${out_var} FALSE PARENT_SCOPE)
endfunction()
function(qt_commandline_cxxstd arg val nextok) function(qt_commandline_cxxstd arg val nextok)
if("${val}" STREQUAL "") if("${val}" STREQUAL "")
qtConfGetNextCommandlineArg(val) qtConfGetNextCommandlineArg(val)
@ -187,4 +174,3 @@ function(qt_commandline_sanitize arg val nextok)
qtConfAddError("Invalid argument '${val}' to command line parameter '${arg}'") qtConfAddError("Invalid argument '${val}' to command line parameter '${arg}'")
endif() endif()
endfunction() endfunction()
# special case end