[Qt] Use Qt's module system for install rules and depending on QtWebKit
authorvestbo@webkit.org <vestbo@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 9 Mar 2012 07:39:50 +0000 (07:39 +0000)
committervestbo@webkit.org <vestbo@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 9 Mar 2012 07:39:50 +0000 (07:39 +0000)
commit4835bab20c50a1cbab2032b3b3530e02f315c80d
treea3fe4fc881ca545e0454beade9639093ce15f5be
parentb32e81c80d0a36384a0bc043db9eabc0ee08f567
[Qt] Use Qt's module system for install rules and depending on QtWebKit

Instead of rolling our own install rules we now use the same approach as
every other Qt module, by loading qt_module.prf and qt_module_config.prf.

This ensures that we follow the same semantics as the rest of Qt on
what sort of config options are enabled by default (create_cmake eg.).
It also allows us to use QT += webkit instead of the workaround we had
with CONFIG += qtwebkit.

We do however force Qt to always treat our build as a non-developer build,
so the libraries will end up in the WebKit lib directory instead of the
qtbase directory (as with a normal developer-build). This allows us to
keep the webkit-build self-contained. If Qt is a developer build we still
copy the module file manually to Qt, so that you don't have to install
WebKit to make it available.

For non-developer builds of Qt, it is still possible to use the built
WebKit libraries without having to install them, by having the variable
QMAKE_EXTRA_MODULE_FORWARDS set in the project's .qmake.cache file,
pointing to $WEBKITOUTUTDIR/$CONFIGURATION/modules.

https://bugs.webkit.org/show_bug.cgi?id=80590

Reviewed by Simon Hausmann.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@110272 268f45cc-cd09-0410-ab3c-d52691b4dbfc
38 files changed:
ChangeLog
Source/WebKit/qt/ChangeLog
Source/WebKit/qt/declarative/experimental/experimental.pri
Source/WebKit/qt/declarative/experimental/plugin.cpp
Source/WebKit/qt/declarative/plugin.cpp
Source/WebKit/qt/declarative/public.pri
Source/WebKit/qt/tests/tests.pri
Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/API/qt/tests/publicapi/publicapi.pro
Source/WebKit2/UIProcess/API/qt/tests/publicapi/tst_publicapi.cpp
Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior.pro
Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView.pro
Source/WebKit2/UIProcess/API/qt/tests/qmltests/tst_qmltests.cpp
Source/WebKit2/UIProcess/API/qt/tests/qquickwebview/qquickwebview.pro
Source/WebKit2/UIProcess/API/qt/tests/qquickwebview/tst_qquickwebview.cpp
Source/WebKit2/UIProcess/API/qt/tests/tests.pri
Source/WebKit2/UIProcess/API/qt/tests/util.cpp
Source/WebKit2/WebProcess.pro
Source/api.pri
Source/sync.profile
Tools/ChangeLog
Tools/DumpRenderTree/qt/DumpRenderTree.pro
Tools/MiniBrowser/qt/BrowserWindow.cpp
Tools/MiniBrowser/qt/MiniBrowser.pro
Tools/MiniBrowser/qt/MiniBrowserApplication.cpp
Tools/MiniBrowser/qt/UrlLoader.cpp
Tools/QtTestBrowser/QtTestBrowser.pro
Tools/Tools.pro
Tools/WebKitTestRunner/InjectedBundle/Target.pri
Tools/WebKitTestRunner/Target.pri
Tools/qmake/mkspecs/features/default_post.prf
Tools/qmake/mkspecs/features/default_pre.prf
Tools/qmake/mkspecs/features/functions.prf
Tools/qmake/mkspecs/features/qtwebkit-private.prf [deleted file]
Tools/qmake/mkspecs/features/qtwebkit.prf
Tools/qmake/mkspecs/features/rpath.prf
Tools/qmake/mkspecs/modules/qt_webkit.pri [deleted file]
Tools/qmake/qt_webkit.pri [new file with mode: 0644]