[SCM] Qt Mobility packaging branch, master, updated. debian/1.2.0-beta0+git3174-2-7-g3e3acb5
Fathi Boudra
fabo at alioth.debian.org
Sun Jun 19 18:08:42 UTC 2011
The following commit has been merged in the master branch:
commit 8204cb4f8de8210d59188637773807e5f5df3b86
Author: Fathi Boudra <fabo at debian.org>
Date: Sun Jun 19 20:58:38 2011 +0300
Drop revert_QTMOBILITY-614.patch
---
debian/changelog | 1 +
debian/patches/revert_QTMOBILITY-614.patch | 41 ----------------------------
debian/patches/series | 1 -
3 files changed, 1 insertions(+), 42 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1cc809b..bc8b7b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
qtmobility (1.2.0-1) unstable; urgency=low
* New upstream release.
+ * Drop revert_QTMOBILITY-614.patch.
-- Fathi Boudra <fabo at debian.org> Sun, 19 Jun 2011 14:49:12 +0300
diff --git a/debian/patches/revert_QTMOBILITY-614.patch b/debian/patches/revert_QTMOBILITY-614.patch
deleted file mode 100644
index 0d6b8c1..0000000
--- a/debian/patches/revert_QTMOBILITY-614.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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
- */
-
- /*!
-- n QContactUrl::setUrl(const QUrl& url)
-- Sets the url stored in this detail to the string representation
-- of the given url.
-- */
--
--/*!
- n QContactUrl::setSubType(const QString& subType)
- Sets the subtype which this detail implements to be the given 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 5f935c7..599e841 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
no_rpath.patch
fix_translations_install_path.patch
use_isabspath.patch
-revert_QTMOBILITY-614.patch
--
Qt Mobility packaging
More information about the pkg-kde-commits
mailing list