summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2012-08-27 13:02:18 +0200
committerQt by Nokia <qt-info@nokia.com>2012-08-28 13:02:06 +0200
commit877cec0228b6de847e102f9aabdb5b1781ff28a8 (patch)
tree5b0271d54a712323cb61d488361e499974f2e883
parentf4f66ff10724e33d42f76d8129b54c08b8d2c581 (diff)
Fix make install with WebKitv5.0.0-beta1
Avoid running "make install" through build-webkit and therefore risk accidentally rebuilding the lot. We call build-webkit either with --release or without, but we never pass --debug. Therefore the build directory is always WebKitBuild/Release. This is a stop-gap for the Qt 5 beta. After the release we'll get rid of qtwebkit.pri altogether and WebKit will be built with just qmake and make. Change-Id: I21ff7ef8420b67cf466d5bca5efd7a1245bf4131 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
-rw-r--r--qtwebkit.pri8
1 files changed, 1 insertions, 7 deletions
diff --git a/qtwebkit.pri b/qtwebkit.pri
index cb169130..9f69ff0f 100644
--- a/qtwebkit.pri
+++ b/qtwebkit.pri
@@ -73,13 +73,7 @@ module_qtwebkit_clean.commands = $${OPTI}$${SBC}cd qtwebkit && \
module_qtwebkit_clean.commands += $$escape_expand(\\n)clean: module-qtwebkit-clean
module_qtwebkit_clean.target = module-qtwebkit-clean
-module_qtwebkit_install.commands = $${OPTI}$${SBC}cd qtwebkit && \
- $$env_export \"WEBKITOUTPUTDIR=$$OUT_PWD/qtwebkit/WebKitBuild\" && $$GNUTOOLS \
- perl $$PWD$${DS}qtwebkit$${DS}$${qtwebkit_tools_dir}$${DS}Scripts$${DS}build-webkit \
- --qt \
- --qmake=$(QMAKE) \
- --install-libs=$$[QT_INSTALL_LIBS] \
- "--makeargs=\"install\""
+module_qtwebkit_install.commands = $${OPTI}$${SBC}cd qtwebkit/WebKitBuild/Release && $(MAKE) install
# Trick to force dependency on this rule.
module_qtwebkit_install.commands+= $$escape_expand(\\n)install: module-qtwebkit-install
module_qtwebkit_install.target = module-qtwebkit-install