AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Configure: Restore default prefix on Windows

Browse Source 
The configure unification accidentally changed it to /usr/local as used on
unix. Use C:/Qt again.

Task-number: QTBUG-61373
Change-Id: I758c639bdb07c97b55f990821e73a5135038f4a0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
This commit is contained in:
Orgad Shaneh 2017-11-01 14:21:21 +02:00 committed by Orgad Shaneh
parent 37161d0380
commit fe19527a43
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure.pri
View File

@ -694,10 +694,14 @@ defineReplace(printHostPaths) {
defineTest(qtConfOutput_preparePaths) { defineTest(qtConfOutput_preparePaths) {
isEmpty(config.input.prefix) { isEmpty(config.input.prefix) {
$$qtConfEvaluate("features.developer-build"): \ $$qtConfEvaluate("features.developer-build") {
config.input.prefix = $$QT_BUILD_TREE # In Development, we use sandboxed builds by default config.input.prefix = $$QT_BUILD_TREE # In Development, we use sandboxed builds by default
else: \ } else {
config.input.prefix = /usr/local/Qt-$$[QT_VERSION] win32: \
config.input.prefix = C:/Qt/Qt-$$[QT_VERSION]
else: \
config.input.prefix = /usr/local/Qt-$$[QT_VERSION]
}
have_prefix = false have_prefix = false
} else { } else {
config.input.prefix = $$absolute_path($$config.input.prefix, $$OUT_PWD) config.input.prefix = $$absolute_path($$config.input.prefix, $$OUT_PWD)