Skip to content

Commit

Permalink
configure: Remove vestiges of handling QMAKE_* variable assignments
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
jobor committed Nov 24, 2021
1 parent 95907f9 commit a756a9a
Showing 1 changed file with 0 additions and 14 deletions.
14 changes: 0 additions & 14 deletions qt_cmdline.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ qt_commandline_subconfig(src/printsupport)
qt_commandline_subconfig(src/plugins/sqldrivers)
qt_commandline_subconfig(src/testlib)
qt_commandline_subconfig(src/tools)
qt_commandline_custom(qmakeArgs)
qt_commandline_option(prefix TYPE string)
qt_commandline_option(extprefix TYPE string)
qt_commandline_option(archdatadir TYPE string)
Expand Down Expand Up @@ -124,18 +123,6 @@ qt_commandline_prefix(L lpaths)
qt_commandline_prefix(R rpaths)
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)
if("${val}" STREQUAL "")
qtConfGetNextCommandlineArg(val)
Expand Down Expand Up @@ -187,4 +174,3 @@ function(qt_commandline_sanitize arg val nextok)
qtConfAddError("Invalid argument '${val}' to command line parameter '${arg}'")
endif()
endfunction()
# special case end

0 comments on commit a756a9a

Please sign in to comment.