diff options
| author | hausmann@webkit.org <hausmann@webkit.org> | 2012-11-07 09:32:33 +0000 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-07 10:53:46 +0100 |
| commit | 69d7c744c9de19d152dbe2d8e46eb7dfd4511d1a (patch) | |
| tree | cebf22d61659a802e5a0cc4115a4627d5b300848 /Tools | |
| parent | af0876ba37c05ba79c87e7214baf16486b06d4e7 (diff) | |
| download | qtwebkit-69d7c744c9de19d152dbe2d8e46eb7dfd4511d1a.tar.gz | |
Fix build of modules depending on QtWebKit when using prefix https://bugs.webkit.org/show_bug.cgi?id=101437
Patch by Oswald Buddenhagen <oswald.buddenhagen@nokia.com> on 2012-11-07
Reviewed by Simon Hausmann.
.:
.qmake.conf loads qt_build_config.prf, which nowadays is responsible for
adding the path to .qmake.super (before it was done by default_pre.prf,
so having setting the path in our default_pre wrapper was sufficient).
* .qmake.conf:
Tools:
Remove setting of MODULE_QMAKE_OUTDIR from here, it's been moved to .qmake.conf.
* qmake/mkspecs/features/default_pre.prf:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@133730 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/ChangeLog | 11 | ||||
| -rw-r--r-- | Tools/qmake/mkspecs/features/default_pre.prf | 3 |
2 files changed, 11 insertions, 3 deletions
diff --git a/Tools/ChangeLog b/Tools/ChangeLog index e90f28b15..ac5353b60 100644 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,3 +1,14 @@ +2012-11-07 Oswald Buddenhagen <oswald.buddenhagen@nokia.com> + + [Qt] Fix build of modules depending on QtWebKit when using prefix + https://bugs.webkit.org/show_bug.cgi?id=101437 + + Reviewed by Simon Hausmann. + + Remove setting of MODULE_QMAKE_OUTDIR from here, it's been moved to .qmake.conf. + + * qmake/mkspecs/features/default_pre.prf: + 2012-10-25 Simon Hausmann <simon.hausmann@digia.com> [Qt] Fix the LLInt build on Windows diff --git a/Tools/qmake/mkspecs/features/default_pre.prf b/Tools/qmake/mkspecs/features/default_pre.prf index 8180741c4..a827f0edc 100644 --- a/Tools/qmake/mkspecs/features/default_pre.prf +++ b/Tools/qmake/mkspecs/features/default_pre.prf @@ -25,9 +25,6 @@ ROOT_WEBKIT_DIR = $$replace(PWD, /Tools/qmake/mkspecs/features$,) WEBKIT_SUBDIR = $$replace(_PRO_FILE_PWD_, $${ROOT_WEBKIT_DIR},) ROOT_BUILD_DIR = $$replace(OUT_PWD, $${WEBKIT_SUBDIR}$,) -# The qmake generated module files belong into our Tools/qmake dir -MODULE_QMAKE_OUTDIR = $$ROOT_BUILD_DIR/Tools/qmake - # Now we're ready to load default_pre from Qt load(default_pre) |