diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-10-01 12:22:50 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-10-01 14:34:05 +0200 |
| commit | 077ea0c63326013ff6d9c85e59b322ffc2ec278c (patch) | |
| tree | 47726ac38699b07f933b7fd026192862c9b47aa1 | |
| parent | e750fa8509d350cbbcddc81174516745f6ffe9f3 (diff) | |
configure: add -qmake argument
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 <alexandru.croitor@qt.io>
| -rwxr-xr-x | configure | 3 | ||||
| -rw-r--r-- | configure.bat | 7 |
2 files changed, 10 insertions, 0 deletions
@@ -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 diff --git a/configure.bat b/configure.bat index 8323f9ec85..d90ebd150d 100644 --- a/configure.bat +++ b/configure.bat @@ -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 @@ -152,6 +155,10 @@ goto doneargs set CMAKE=true goto nextarg +:qmake + set CMAKE= + goto nextarg + :doneargs if "%CMAKE%" == "true" goto cmake |