diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-01-04 07:31:22 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-01-04 07:33:14 +0100 |
| commit | 03039979b5a643f9def38a73e19835bb69384202 (patch) | |
| tree | e8a9184d5963128f013247ac64ec768d1cbf6911 /config_help.txt | |
| parent | 9682d217e21a2e88b6de799d79b843bbe0039df1 (diff) | |
| parent | 4dc2bc323c985bdceb27f096dd6c8e7af657bb6b (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Also blacklist tst_QRawFont::unsupportedWritingSystem() and
tst_QGlyphRun::mixedScripts() on windows for now.
Conflicts:
qmake/generators/makefile.cpp
src/corelib/itemmodels/qstringlistmodel.cpp
src/platformsupport/fontdatabases/windows/qwindowsfontengine_p.h
tests/auto/corelib/itemmodels/qstringlistmodel/tst_qstringlistmodel.cpp
tests/auto/gui/text/qglyphrun/BLACKLIST
tests/auto/gui/text/qrawfont/BLACKLIST
Task-number: QTBUG-72836
Change-Id: I10fea1493f0ae1a5708e1e48d0a4d7d6b76258b9
Diffstat (limited to 'config_help.txt')
| -rw-r--r-- | config_help.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config_help.txt b/config_help.txt index 2d4664f4a9..8cca40c461 100644 --- a/config_help.txt +++ b/config_help.txt @@ -17,7 +17,8 @@ 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] + [/usr/local/Qt-$QT_VERSION; qtbase build directory if + -developer-build] -extprefix <dir> ... The installation directory, as seen on the host machine. [SYSROOT/PREFIX] -hostprefix [dir] .. The installation directory for build tools running on |