diff options
| -rw-r--r-- | .qmake.conf | 4 | ||||
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | Tools/ChangeLog | 11 | ||||
| -rw-r--r-- | Tools/qmake/mkspecs/features/default_pre.prf | 3 |
4 files changed, 27 insertions, 4 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) @@ -1,3 +1,16 @@ +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-10-23 Andras Becsi <andras.becsi@digia.com> Remove devicePixelRatio from ViewportAttributes 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) |