From fe19527a4347dfbf39bc9073ff26a9f5a28930c0 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Wed, 1 Nov 2017 14:21:21 +0200 Subject: 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 --- configure.pri | 10 +++++++--- 1 file 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) -- cgit v1.2.3