[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
hausmann at webkit.org
hausmann at webkit.org
Wed Dec 22 11:26:24 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit b3806937f0226ed0a85bba92839ce14de199bc72
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jul 23 14:27:11 2010 +0000
[Qt] Build fix for Qt apps
Add webkit to QT_CONFIG. qconfig.pri will read qt_webkit_version.pri and
that's how it will pick up webkit in QT_CONFIG.
* qt_webkit_version.pri:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63971 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 4f1706e..8ff0e56 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,12 @@
+2010-07-23 Simon Hausmann <simon.hausmann at nokia.com>
+
+ [Qt] Build fix for Qt apps
+
+ Add webkit to QT_CONFIG. qconfig.pri will read qt_webkit_version.pri and
+ that's how it will pick up webkit in QT_CONFIG.
+
+ * qt_webkit_version.pri:
+
2010-07-22 Yael Aharon <yael.aharon at nokia.com>
Reviewed by Laszlo Gombos.
diff --git a/WebKit/qt/qt_webkit_version.pri b/WebKit/qt/qt_webkit_version.pri
index 9a78625..ca6299a 100644
--- a/WebKit/qt/qt_webkit_version.pri
+++ b/WebKit/qt/qt_webkit_version.pri
@@ -2,3 +2,4 @@ QT_WEBKIT_VERSION = 4.9.0
QT_WEBKIT_MAJOR_VERSION = 4
QT_WEBKIT_MINOR_VERSION = 9
QT_WEBKIT_PATCH_VERSION = 0
+QT_CONFIG *= webkit
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list