From 97b856b78859861f16304debad29889f691d9eb7 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Sun, 14 Aug 2016 09:48:55 +0200 Subject: 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 Change-Id: Ia1941f2c34b7f5bd4990a7673cd737361381c2e7 Reviewed-by: Lars Knoll Reviewed-by: Oswald Buddenhagen --- config_help.txt | 1 - 1 file changed, 1 deletion(-) (limited to 'config_help.txt') diff --git a/config_help.txt b/config_help.txt index 9cd70672b0..fa18bf3964 100644 --- a/config_help.txt +++ b/config_help.txt @@ -6,7 +6,6 @@ are mentioned in the descriptions of the options they relate to. It is also possible to manipulate any QMAKE_* variable, to amend the values from the mkspec for the build of Qt itself, e.g., QMAKE_CXXFLAGS+=-g3. -(Unix/MSys configure only) Top-level installation directories: -prefix ...... The deployment directory, as seen on the target device. -- cgit v1.2.3