[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
hausmann at webkit.org
hausmann at webkit.org
Thu Apr 8 00:57:17 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit c492bffdc0b7a753a51555705340d5b18926ff6f
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jan 7 17:14:42 2010 +0000
prospective bearer management build fix to get the include path correct
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52926 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ba9338f..71d5c67 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-01-07 Simon Hausmann <simon.hausmann at nokia.com>
+
+ Reviewed by Tor Arne Vestbø.
+
+ [Qt] Fix linkage against Qt mobility API bearer management module
+
+ Use the documented .pro file syntax to link against the correct
+ library and (more importantly) get the include paths correct.
+
+ * WebCore.pro:
+
2010-01-07 Eric Carlson <eric.carlson at apple.com>
Reviewed by Maciej Stachowiak.
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 4d3e9e6..825dc2f 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -2915,8 +2915,8 @@ contains(DEFINES, ENABLE_QT_BEARER=1) {
SOURCES += \
platform/network/qt/NetworkStateNotifierQt.cpp
- LIBS += -lQtBearer
-
+ CONFIG += mobility
+ MOBILITY += bearer
}
contains(DEFINES, ENABLE_SVG=1) {
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list