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: https://svn.webkit.org/repository/webkit/trunk@133730
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
-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)
+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.
+
+ .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:
+
2012-11-06 Keishi Hattori <keishi@webkit.org>
Implement month picking to calendar picker
+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-11-06 Dan Beam <dbeam@chromium.org>
Enable REQUEST_AUTOCOMPLETE for chromium port
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)