[SCM] Qt 4 packaging branch, experimental-snapshots, updated. debian/4.7.0-beta2-2-4-gfda1cff

[Fathi Boudra]

The following commit has been merged in the experimental-snapshots branch:
commit fda1cff62faad916de88f8219a7801a8cba5966d
Author: Fathi Boudra <fabo at debian.org>
Date:   Fri Jul 23 16:15:57 2010 +0300

    Add 0001_add_webkit_qt_config.patch to load modules .pri files
---
 debian/changelog                               |    2 +
 debian/patches/0001_add_webkit_qt_config.patch |   28 ++++++++++++++++++++++++
 debian/patches/series                          |    3 ++
 3 files changed, 33 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f6d97a5..caed648 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 qt4-x11 (4:4.7.0~beta2-3) UNRELEASED; urgency=low
 
+  * Add 0001_add_webkit_qt_config.patch to load modules .pri files.
+    Fix the detection of Qt WebKit when shipped standalone.
   * Update debian/control:
     - remove references to Debian in package descriptions
       (derivatives friendly).
diff --git a/debian/patches/0001_add_webkit_qt_config.patch b/debian/patches/0001_add_webkit_qt_config.patch
new file mode 100644
index 0000000..bc3746d
--- /dev/null
+++ b/debian/patches/0001_add_webkit_qt_config.patch
@@ -0,0 +1,28 @@
+Description: when Qt is built with -no-webkit and Qt WebKit is used
+             Qt applications cannot found webkit as they rely on qmake. 
+             This patch modify qconfig.pri to load modules .pri files.
+Author: Simon Hausmann <simon.hausmann at nokia.com>
+Author: Fathi Boudra <fathi.boudra at nokia.com>
+
+--- a/configure
++++ b/configure
+@@ -7651,6 +7651,9 @@ QT_LIBINFIX = $QT_LIBINFIX
+ QT_NAMESPACE = $QT_NAMESPACE
+ QT_NAMESPACE_MAC_CRC = $QT_NAMESPACE_MAC_CRC
+ 
++#modules
++for(mod,$$list($$files($$[QMAKE_MKSPECS]/modules/qt_*.pri))):include($$mod)
++
+ EOF
+ if [ "$CFG_RPATH" = "yes" ]; then
+     echo "QMAKE_RPATHDIR += \"$QT_INSTALL_LIBS\"" >> "$QTCONFIG.tmp"
+--- a/mkspecs/modules/qt_webkit_version.pri
++++ b/mkspecs/modules/qt_webkit_version.pri
+@@ -1,3 +1,7 @@
++#configuration
++QT_CONFIG *= webkit
++
++#versioning
+ QT_WEBKIT_VERSION = 4.7.0
+ QT_WEBKIT_MAJOR_VERSION = 4
+ QT_WEBKIT_MINOR_VERSION = 7
diff --git a/debian/patches/series b/debian/patches/series
index ab367e1..c084f9c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,6 @@
+# upstream patches
+0001_add_webkit_qt_config.patch
+
 # qt-copy patches
 0180-window-role.diff
 0195-compositing-properties.diff

-- 
Qt 4 packaging