diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-08-14 09:48:55 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-18 17:10:47 +0000 |
| commit | 97b856b78859861f16304debad29889f691d9eb7 (patch) | |
| tree | c570975edb23c5790b323af7218ca4f28e6dd0bf /mkspecs/features/qt_configure.prf | |
| parent | c027cffbef6cb317a5a09e1785398c046f0a6395 (diff) | |
Use the qmake based configuration system also on Windows
Adapt configure.exe to use qmake to do most of the work of configuring
Qt. This unifies a large part of our configuration system between Unix
and Windows. configure.exe is now still doing the license check,
creating qconfig.cpp, building qmake, and not much more.
On the way, re-implement the still missing Windows-specific tests with
the new system.
The opengles2 vs. opengl-desktop conditions got a bit convoluted, as
Unix prefers desktop GL, while Windows GLES2 (via ANGLE). Superficially,
there is a circular dependency, but the platform scopes are supposed to
break it.
Done-with: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Change-Id: Ia1941f2c34b7f5bd4990a7673cd737361381c2e7
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'mkspecs/features/qt_configure.prf')
| -rw-r--r-- | mkspecs/features/qt_configure.prf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf index c87c65289e..5a3f8410a2 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -312,7 +312,7 @@ defineReplace(qtConfFindInPathList) { defineReplace(qtConfFindInPath) { ensurePathEnv() - return($$qtConfFindInPathList($$1, $$QMAKE_PATH_ENV)) + return($$qtConfFindInPathList($$1, $$2 $$QMAKE_PATH_ENV)) } defineReplace(qtConfPkgConfigEnv) { @@ -694,7 +694,7 @@ defineTest(qtConfTest_files) { file = $$qtConfFindInPathList($$f, $$EXTRA_LIBDIR $$QMAKE_DEFAULT_LIBDIRS) } else { # assume we're looking for an executable - file = $$qtConfFindInPath($$f) + file = $$qtConfFindInPath($$f, $$EXTRA_PATH) } isEmpty(file) { qtLog(" Not found."); |