[SCM] Qt Mobility packaging branch, master, updated. debian/1.0.2-1-10-g9ad64ea

[Fathi Boudra]

The following commit has been merged in the master branch:
commit 9488d5b4747c439b2f5f23be95a43695bfaf66ad
Author: Fathi Boudra <fabo at debian.org>
Date:   Wed Mar 9 11:27:35 2011 +0200

    add revert_QTMOBILITY-614.patch: revert commit 0fd9fc9 - It breaks 3rd party
    applications build.
---
 debian/changelog                           |    3 ++
 debian/patches/revert_QTMOBILITY-614.patch |   41 ++++++++++++++++++++++++++++
 debian/patches/series                      |    4 +--
 3 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4b63858..991f81c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ qtmobility (1.2.0~beta0+git3174-1) unstable; urgency=low
     - ftbfs_multimedia_examples.patch - fixed upstream.
     - enable_pkgconfig_support.patch - fixed upstream.
     - qmf_2010w36_support.patch - merged upstream.
+  * Add patches:
+    - revert_QTMOBILITY-614.patch: revert commit 0fd9fc9 - It breaks 3rd party
+      applications build.
 
  -- Fathi Boudra <fabo at debian.org>  Sun, 06 Mar 2011 14:15:40 +0200
 
diff --git a/debian/patches/revert_QTMOBILITY-614.patch b/debian/patches/revert_QTMOBILITY-614.patch
new file mode 100644
index 0000000..0d6b8c1
--- /dev/null
+++ b/debian/patches/revert_QTMOBILITY-614.patch
@@ -0,0 +1,41 @@
+Description: Revert commit 0fd9fc9 - It breaks 3rd party applications build
+
+commit 0fd9fc92747af0cbc26a12cdf0d4fc85b22753dc
+Author: Chris Adams <christopher.adams at nokia.com>
+Date:   Tue Nov 23 10:59:49 2010 +1000
+
+    Add convenience function to QContactUrl
+    
+    Previously, the setUrl function took a QString parameter.  This commit
+    adds a convenience function which takes a QUrl parameter, and
+    internally calls toString() on the given url parameter before storing
+    it.
+    
+    Task-number: QTMOBILITY-614
+    Reviewed-by: Kevin Wu Won
+
+--- a/src/contacts/details/qcontactdetails.cpp
++++ b/src/contacts/details/qcontactdetails.cpp
+@@ -814,12 +814,6 @@ Q_DEFINE_LATIN1_CONSTANT(QContactUrl::Su
+  */
+ 
+ /*!
+-   \fn QContactUrl::setUrl(const QUrl& url)
+-   Sets the url stored in this detail to the string representation
+-   of the given \a url.
+- */
+-
+-/*!
+    \fn QContactUrl::setSubType(const QString& subType)
+    Sets the subtype which this detail implements to be the given \a subType.
+  */
+--- a/src/contacts/details/qcontacturl.h
++++ b/src/contacts/details/qcontacturl.h
+@@ -72,7 +72,6 @@ public:
+ #endif
+ 
+     void setUrl(const QString& url) {setValue(FieldUrl, url);}
+-    void setUrl(const QUrl& url) {setValue(FieldUrl, url.toString());}
+     QString url() const {return value(FieldUrl);}
+ 
+     void setSubType(const QString& subType) {setValue(FieldSubType, subType);}
diff --git a/debian/patches/series b/debian/patches/series
index e2f4a63..5f935c7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,4 @@
 no_rpath.patch
-ftbfs_multimedia_examples.patch
 fix_translations_install_path.patch
-enable_pkgconfig_support.patch
 use_isabspath.patch
-qmf_2010w36_support.patch
+revert_QTMOBILITY-614.patch

-- 
Qt Mobility packaging