Skip to content

Commit

Permalink
configure: add -qmake argument
Browse files Browse the repository at this point in the history
This option configures Qt with the qmake-based build system.
Currently, this is the default, so this option is a no-op until the
default switches to CMake.

Task-number: QTBUG-87049
Change-Id: I56f3080a4f1423788ffb743287a7b2e67a8e2cc4
Reviewed-by: Alexandru Croitor <[email protected]>
  • Loading branch information
jobor committed Oct 1, 2020
1 parent e750fa8 commit 077ea0c
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
3 changes: 3 additions & 0 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -558,6 +558,9 @@ while [ "$#" -gt 0 ]; do
cmake)
BUILD_WITH_CMAKE=yes
;;
qmake)
BUILD_WITH_CMAKE=no
;;
redo)
if [ -f ${outpathPrefix}config.opt ]; then
if grep -e ^-cmake <${outpathPrefix}config.opt >/dev/null 2>&1; then
Expand Down
7 changes: 7 additions & 0 deletions configure.bat
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,9 @@ goto doneargs
if /i "%~1" == "-cmake" goto cmake
if /i "%~1" == "--cmake" goto cmake

if /i "%~1" == "-qmake" goto qmake
if /i "%~1" == "--qmake" goto qmake

:nextarg
shift
goto doargs
Expand Down Expand Up @@ -152,6 +155,10 @@ goto doneargs
set CMAKE=true
goto nextarg

:qmake
set CMAKE=
goto nextarg

:doneargs

if "%CMAKE%" == "true" goto cmake
Expand Down

0 comments on commit 077ea0c

Please sign in to comment.