Skip to content

Commit

Permalink
Configure: Restore default prefix on Windows
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
orgads committed Apr 9, 2018
1 parent 37161d0 commit fe19527
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions configure.pri
Original file line number Diff line number Diff line change
Expand Up @@ -694,10 +694,14 @@ defineReplace(printHostPaths) {
defineTest(qtConfOutput_preparePaths) {
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
else: \
config.input.prefix = /usr/local/Qt-$$[QT_VERSION]
} else {
win32: \
config.input.prefix = C:/Qt/Qt-$$[QT_VERSION]
else: \
config.input.prefix = /usr/local/Qt-$$[QT_VERSION]
}
have_prefix = false
} else {
config.input.prefix = $$absolute_path($$config.input.prefix, $$OUT_PWD)
Expand Down

0 comments on commit fe19527

Please sign in to comment.