diff options
author | Liang Qi <liang.qi@qt.io> | 2017-03-13 09:50:43 +0100 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2017-03-13 15:55:44 +0100 |
commit | d51c3ecf8ef6e28557c66745f50a223cc5b1ce54 (patch) | |
tree | 023a1ecaa944152e08ba11291ec7aadc12f59dad /configure.pri | |
parent | f06f1adb6cc3835793a15eafa2d5a3affad712a2 (diff) | |
parent | 3a1f4b186d8ce79717da37f808ff9a4b3e949d9c (diff) |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
examples/network/network.pro
mkspecs/features/mac/default_post.prf
src/corelib/io/qfilesystemengine_win.cpp
src/corelib/io/qprocess.cpp
src/corelib/io/qprocess.h
src/corelib/io/qprocess_p.h
src/corelib/io/qprocess_unix.cpp
src/corelib/io/qprocess_win.cpp
src/corelib/thread/qmutex.cpp
src/platformsupport/fontdatabases/windows/windows.pri
src/plugins/platforms/eglfs/eglfsdeviceintegration.pro
tests/auto/corelib/io/io.pro
Change-Id: I8a27e0e141454818bba9c433200a4e84a88d147e
Diffstat (limited to 'configure.pri')
-rw-r--r-- | configure.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.pri b/configure.pri index 2dde7477a0..42f3247a59 100644 --- a/configure.pri +++ b/configure.pri @@ -835,7 +835,7 @@ defineTest(qtConfOutput_preparePaths) { !equals(QT_SOURCE_TREE, $$QT_BUILD_TREE): \ cont += \ "[EffectiveSourcePaths]" \ - "Prefix=$$QT_SOURCE_TREE" + "Prefix=$$[QT_INSTALL_PREFIX/src]" write_file($$QT_BUILD_TREE/bin/qt.conf, cont)|error() reload_properties() |