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 /.qmake.conf | |
| 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 '.qmake.conf')
| -rw-r--r-- | .qmake.conf | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/.qmake.conf b/.qmake.conf index 1889acc25..646dc0ce0 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,2 +1,4 @@ -QMAKEPATH += $$PWD/Tools/qmake $$shadowed($$PWD/Tools/qmake) +# The qmake generated module files belong into our Tools/qmake dir +MODULE_QMAKE_OUTDIR = $$shadowed($$PWD/Tools/qmake) +QMAKEPATH += $$PWD/Tools/qmake $$MODULE_QMAKE_OUTDIR load(qt_build_config) |