diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2017-12-29 15:56:33 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2017-12-30 12:09:53 +0100 |
| commit | db92f2f3aac60218756a1aa8811cf192acc0b0e6 (patch) | |
| tree | f28a47aebb2f08e221fe7bffafce62a0a96cf7fd /config_help.txt | |
| parent | dd61a1d98ea9fbffeaf0e2adcd0ddd58105f6a75 (diff) | |
| parent | 44da5b863597e761df3545dc7ff02a9b53bbb13d (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
.qmake.conf
mkspecs/win32-g++/qmake.conf
src/corelib/global/qglobal_p.h
src/corelib/global/qoperatingsystemversion_p.h
src/corelib/io/qfilesystemengine_win.cpp
src/network/bearer/qbearerengine.cpp
src/platformsupport/input/libinput/qlibinputpointer.cpp
src/sql/doc/snippets/code/doc_src_sql-driver.cpp
src/widgets/kernel/qwidget_p.h
src/widgets/kernel/qwidgetwindow.cpp
src/widgets/styles/qfusionstyle.cpp
tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
Change-Id: I80e2722f481b12fff5d967c28f89208c0e9a1dd8
Diffstat (limited to 'config_help.txt')
| -rw-r--r-- | config_help.txt | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/config_help.txt b/config_help.txt index 6b1401c618..9c424391a9 100644 --- a/config_help.txt +++ b/config_help.txt @@ -9,6 +9,12 @@ ICU_PREFIX=/opt/icu42 ICU_LIBS="-licui18n -licuuc -licudata". It is also possible to manipulate any QMAKE_* variable, to amend the values from the mkspec for the build of Qt itself, e.g., QMAKE_CXXFLAGS+=-g3. +Note that the *_LIBS* and QMAKE_* assignments manipulate lists, so items +containing meta characters (spaces in particular) need to be quoted according +to qmake rules. On top of that, the assignments as a whole need to be quoted +according to shell rules. It is recommended to use single quotes for the inner +quoting and double quotes for the outer quoting. + Top-level installation directories: -prefix <dir> ...... The deployment directory, as seen on the target device. [/usr/local/Qt-$QT_VERSION, $PWD if -developer-build] @@ -60,8 +66,10 @@ Configure meta: -redo ................ Re-configure with previously used options. Additional options may be passed, but will not be saved for later use by -redo. - -recheck ............. Discard cached negative configure test results. + -recheck [test,...] .. Discard cached negative configure test results. Use this after installing missing dependencies. + Alternatively, if tests are specified, only their + results are discarded. -recheck-all ......... Discard all cached configure test results. -feature-<feature> ... Enable <feature> |