diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2017-11-01 14:21:21 +0200 |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@qt.io> | 2018-05-24 08:14:59 +0000 |
| commit | 4524cb8c98b1efe650915788f6f58cf9f35591a1 (patch) | |
| tree | 130840d03cfd97f636a42e1da9a8cabc9c2e1e0a | |
| parent | f24bd1b8183ec9cc4e239dc560072d3896ec61a1 (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
(cherry picked from commit fe19527a4347dfbf39bc9073ff26a9f5a28930c0)
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| -rw-r--r-- | configure.pri | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/configure.pri b/configure.pri index dc703ecb14..f53d6c1b04 100644 --- a/configure.pri +++ b/configure.pri @@ -677,10 +677,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) |