summaryrefslogtreecommitdiff
path: root/configure.exe
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-08-23 19:42:00 +0200
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-08-23 20:34:51 +0200
commite645157a5dcf702df21b566441a56753eaefe6c4 (patch)
tree347c29558b21d3512626b2273e6c42f40ede9c37 /configure.exe
parent80a8a3b878eff6f29b68fb4ff4dd9a7b4e00237e (diff)
downloadqt4-tools-e645157a5dcf702df21b566441a56753eaefe6c4.tar.gz
fix build after first webkit self-injection attempt
it didn't work for several reasons: - if the configures don't add webkit to QT_CONFIG, src.pro doesn't even know that it needs to build WebKit at all, so WebKit would never inject itself into the build. hen-and-egg problem. - the in-Qt build doesn't use WebKit.pro in the first place, so a proper recursive qmake would never create qt_webkit_version.pri. it worked under unix because configure collects all project files irrespective of the actual SUBDIRS structure. - a proper recursive qmake will cache the qt config, so the injection wouldn't be effective during the first qmake run so instead let the configures copy the pri file.
Diffstat (limited to 'configure.exe')
-rwxr-xr-xconfigure.exebin1320448 -> 1320960 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/configure.exe b/configure.exe
index c5bff854d8..982e038dc4 100755
--- a/configure.exe
+++ b/configure.exe
Binary files differ