diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2017-11-01 14:21:21 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2018-04-09 15:32:19 +0000 |
| commit | fe19527a4347dfbf39bc9073ff26a9f5a28930c0 (patch) | |
| tree | a0bdd00a569e756b5a02c2daf01f90c03b262307 /configure.pri | |
| parent | 37161d038061584227fe29b9c808acfcc8e865ee (diff) | |
Configure: Restore default prefix on Windows
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>
Diffstat (limited to 'configure.pri')
| -rw-r--r-- | configure.pri | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/configure.pri b/configure.pri index 7185647e44..0512ef0144 100644 --- a/configure.pri +++ b/configure.pri @@ -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) |