diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-30 17:06:40 +0000 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-30 18:06:16 +0100 |
| commit | b4b26b84de865fe6e0b033eafeabbeb461d70546 (patch) | |
| tree | 13fe14dd47e9c6dbbc1de219e65303b5e86b75da /Source | |
| parent | ce45e9f37e947116adf7352955504b5e06aaeae1 (diff) | |
| download | qtwebkit-b4b26b84de865fe6e0b033eafeabbeb461d70546.tar.gz | |
Unreviewed trivial Qt build fix:
Always link against WebProcess against QT += webkit and use webkitwidgets only if available.
* WebProcess.pro:
Change-Id: I6cae343601a7ac34265d4eeb31aeb4d6dba42373
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@136247 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/WebKit2/ChangeLog | 8 | ||||
| -rw-r--r-- | Source/WebKit2/WebProcess.pro | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog index cc9771486..a41bf4386 100644 --- a/Source/WebKit2/ChangeLog +++ b/Source/WebKit2/ChangeLog @@ -1,3 +1,11 @@ +2012-11-30 Simon Hausmann <simon.hausmann@digia.com> + + Unreviewed trivial Qt build fix: + + Always link against WebProcess against QT += webkit and use webkitwidgets only if available. + + * WebProcess.pro: + 2012-11-30 Simon Hausmann <simon.hausmann@digia.com>, Pierre Rossi <pierre.rossi@digia.com> [Qt] Separate Qt WebKit into Qt WebKit and Qt WebKit Widgets diff --git a/Source/WebKit2/WebProcess.pro b/Source/WebKit2/WebProcess.pro index 7f8b1cab8..db3f71a27 100644 --- a/Source/WebKit2/WebProcess.pro +++ b/Source/WebKit2/WebProcess.pro @@ -11,10 +11,10 @@ DESTDIR = $${ROOT_BUILD_DIR}/bin SOURCES += qt/MainQt.cpp -QT += network webkitwidgets +QT += network webkit macx: QT += xml -haveQtModule(widgets): QT += widgets +haveQtModule(widgets): QT += widgets webkitwidgets build?(webkit1): DEFINES += HAVE_WEBKIT1 |