qt4: remove Qt Mobility

Qt Mobility is an obsolete and unmaintained framework that is also
dependent on gstreamer 0.10

https://bugzilla.yoctoproject.org/show_bug.cgi?id=6294

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

12 files changed, 0 insertions, 5442 deletions

diff --git a/meta/recipes-qt/qt4/qt-mobility-1.2.0/0001-fix-embedded-usage-doesn-t-work-outside-of-Qt.patch b/meta/recipes-qt/qt4/qt-mobility-1.2.0/0001-fix-embedded-usage-doesn-t-work-outside-of-Qt.patch
deleted file mode 100644
index d8d88c2cfc..0000000000
--- a/meta/recipes-qt/qt4/qt-mobility-1.2.0/0001-fix-embedded-usage-doesn-t-work-outside-of-Qt.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From de2b568a4f14f38ae26960f543277bd2ac57c9d6 Mon Sep 17 00:00:00 2001
-From: Alex <qt-info@nokia.com>
-Date: Tue, 10 May 2011 14:54:49 +1000
-Subject: [PATCH] fix !embedded usage (doesn't work outside of Qt)
-
-embedded is part of QT_CONFIG and not CONFIG
-
-Task-number: QTMOBILITY-1586
----
-Upstream-Status: Backport
-https://qt.gitorious.org/qt-mobility/qt-mobility/commit/de2b568a4f14f38ae26960f543277bd2ac57c9d6
-EB: refreshed the patch for it to apply properly
-
- plugins/multimedia/gstreamer/gstreamer.pro | 2 +-
- src/systeminfo/systeminfo.pro              | 6 +++---
- tests/auto/auto.pro                        | 2 +-
- 3 files changed, 5 insertions(+), 5 deletions(-)
-
-Index: qt-mobility-opensource-src-1.2.0/plugins/multimedia/gstreamer/gstreamer.pro
-===================================================================
---- qt-mobility-opensource-src-1.2.0.orig/plugins/multimedia/gstreamer/gstreamer.pro	2013-09-19 10:34:40.880862884 +0200
-+++ qt-mobility-opensource-src-1.2.0/plugins/multimedia/gstreamer/gstreamer.pro	2013-09-19 10:35:22.844862550 +0200
-@@ -85,7 +85,7 @@
-     qgstutils.cpp
- 
- 
--!win32:!embedded:!mac:!symbian:!simulator:!contains(QT_CONFIG, qpa) {
-+!win32:!contains(QT_CONFIG,embedded):!mac:!symbian:!simulator:!contains(QT_CONFIG, qpa) {
-     LIBS += -lXv -lX11 -lXext
- 
-     HEADERS += \
-Index: qt-mobility-opensource-src-1.2.0/src/systeminfo/systeminfo.pro
-===================================================================
---- qt-mobility-opensource-src-1.2.0.orig/src/systeminfo/systeminfo.pro	2013-09-19 10:34:40.884862884 +0200
-+++ qt-mobility-opensource-src-1.2.0/src/systeminfo/systeminfo.pro	2013-09-19 10:36:05.480862210 +0200
-@@ -101,7 +101,7 @@
-             LIBS += -lblkid
-         }
- 
--        !embedded:!contains(QT_CONFIG,qpa): {
-+        !contains(QT_CONFIG,embedded):!contains(QT_CONFIG,qpa): {
-             LIBS += -lX11 -lXrandr
-         }
- 
-@@ -154,7 +154,7 @@
-                 #for now... udisks
-             } else {
-                 DEFINES += QT_NO_UDISKS
--                !embedded:!contains(QT_CONFIG,qpa): LIBS += -lX11 -lXrandr
-+                !contains(QT_CONFIG,embedded):!contains(QT_CONFIG,qpa): LIBS += -lX11 -lXrandr
-             }
- 
-             contains(connman_enabled, yes): {
-@@ -165,7 +165,7 @@
-             }
-         } else {
-             DEFINES += QT_NO_NETWORKMANAGER QT_NO_UDISKS QT_NO_CONNMAN
--            !embedded:!contains(QT_CONFIG,qpa): LIBS += -lX11 -lXrandr
-+            !contains(QT_CONFIG,embedded):!contains(QT_CONFIG,qpa): LIBS += -lX11 -lXrandr
-         }
-      }
- 
-Index: qt-mobility-opensource-src-1.2.0/tests/auto/auto.pro
-===================================================================
---- qt-mobility-opensource-src-1.2.0.orig/tests/auto/auto.pro	2013-09-19 10:34:40.884862884 +0200
-+++ qt-mobility-opensource-src-1.2.0/tests/auto/auto.pro	2013-09-19 10:35:22.844862550 +0200
-@@ -21,5 +21,5 @@
- # which require that the autotest is run on the same machine
- # doing the build - i.e. cross-compilation is not allowed.
- win32|mac|linux-g++* {
--    !embedded:!maemo5:!maemo6:SUBDIRS+=host.pro
-+    !contains(QT_CONFIG,embedded):!maemo5:!maemo6:SUBDIRS+=host.pro
- }
diff --git a/meta/recipes-qt/qt4/qt-mobility-1.2.0/0001-gstvideoconnector-fixed-buffers-allocation.patch b/meta/recipes-qt/qt4/qt-mobility-1.2.0/0001-gstvideoconnector-fixed-buffers-allocation.patch
deleted file mode 100644
index 2df76fc778..0000000000
--- a/meta/recipes-qt/qt4/qt-mobility-1.2.0/0001-gstvideoconnector-fixed-buffers-allocation.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Upstream-Status: Submitted [QTMOBILITY-1611]
-
-From b308508b49afa9a129b4e4589c57cd107d1320b8 Mon Sep 17 00:00:00 2001
-From: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
-Date: Fri, 6 May 2011 10:35:11 +1000
-Subject: [PATCH] gstvideoconnector: fixed buffers allocation
-
-It should not be necessary, but at least theora video decoder doesn't
-iniatilize *buf, while gst_pad_alloc_buffer relies on buf being NULL.
-
-Task-number: QTMOBILITY-1611
-Reviewed-by: Michael Goddard
----
- plugins/multimedia/gstreamer/gstvideoconnector.c |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/plugins/multimedia/gstreamer/gstvideoconnector.c b/plugins/multimedia/gstreamer/gstvideoconnector.c
-index ddf68e0..9f8ceae 100644
---- a/plugins/multimedia/gstreamer/gstvideoconnector.c
-+++ b/plugins/multimedia/gstreamer/gstvideoconnector.c
-@@ -186,6 +186,10 @@ gst_video_connector_buffer_alloc (GstPad * pad, guint64 offset, guint size,
-     GstFlowReturn res = GST_FLOW_OK;
-     element = GST_VIDEO_CONNECTOR (GST_PAD_PARENT (pad));
- 
-+    if (!buf)
-+        return GST_FLOW_ERROR;
-+    *buf = NULL;
-+
-     GST_OBJECT_LOCK (element);
-     gst_object_ref(element->srcpad);
-     GST_OBJECT_UNLOCK (element);
--- 
-1.7.4.1
-
diff --git a/meta/recipes-qt/qt4/qt-mobility-1.2.0/0002-Remove-unnecessary-rpaths-from-qml_device-example.patch b/meta/recipes-qt/qt4/qt-mobility-1.2.0/0002-Remove-unnecessary-rpaths-from-qml_device-example.patch
deleted file mode 100644
index a411640b73..0000000000
--- a/meta/recipes-qt/qt4/qt-mobility-1.2.0/0002-Remove-unnecessary-rpaths-from-qml_device-example.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 92e0c611f4969c716616d64df64831387e5b1632 Mon Sep 17 00:00:00 2001
-From: Paul Eggleton <paul.eggleton@linux.intel.com>
-Date: Fri, 16 Mar 2012 10:24:00 +0000
-Subject: [PATCH] Remove unnecessary rpaths from qml_device example
-
-These can't be valid in any case.
-
-Upstream-Status: Pending
-
-Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
----
- examples/declarative-systeminfo/device/device.pro |    3 ---
- 1 files changed, 0 insertions(+), 3 deletions(-)
-
-diff --git a/examples/declarative-systeminfo/device/device.pro b/examples/declarative-systeminfo/device/device.pro
-index 698e5fb..05be9b7 100644
---- a/examples/declarative-systeminfo/device/device.pro
-+++ b/examples/declarative-systeminfo/device/device.pro
-@@ -17,6 +17,3 @@ symbian {
- }
- RESOURCES += device.qrc
- 
--QMAKE_LFLAGS_DEBUG += "-Wl,-rpath,/home/user/qt/lib"
--QMAKE_LFLAGS_RPATH += "-Wl,-rpath,/home/user/qt/lib"
--QMAKE_LFLAGS_RELEASE += "-Wl,-rpath,/home/user/qt/lib"
--- 
-1.7.5.4
-
diff --git a/meta/recipes-qt/qt4/qt-mobility-1.2.0/fix-compile-error-no-bluez.patch b/meta/recipes-qt/qt4/qt-mobility-1.2.0/fix-compile-error-no-bluez.patch
deleted file mode 100644
index 3f03cf7165..0000000000
--- a/meta/recipes-qt/qt4/qt-mobility-1.2.0/fix-compile-error-no-bluez.patch
+++ /dev/null
@@ -1,338 +0,0 @@
-From bb05733bd5a685b00f80ddc73a1b7a9a2ba0eb11 Mon Sep 17 00:00:00 2001
-From: Andrew Stanley-Jones <andrew.stanley-jones@nokia.com>
-Date: Thu, 12 May 2011 13:07:13 +1000
-Subject: [PATCH] Fix compile error if bluez is not installed
-
-Upstream-Status: Backport
-
-Task-number: QTMOBILITY-1576
----
- src/connectivity/bluetooth/bluetooth.pri           |    1 +
- .../bluetooth/qbluetoothdevicediscoveryagent.h     |    2 +-
- .../bluetooth/qbluetoothdevicediscoveryagent_p.cpp |    2 +-
- .../bluetooth/qbluetoothdevicediscoveryagent_p.h   |    6 +++---
- .../bluetooth/qbluetoothlocaldevice_p.h            |    4 ++--
- .../bluetooth/qbluetoothservicediscoveryagent.h    |    2 +-
- .../bluetooth/qbluetoothservicediscoveryagent_p.h  |    8 ++++----
- .../bluetooth/qbluetoothserviceinfo_p.cpp          |    2 +-
- .../bluetooth/qbluetoothserviceinfo_p.h            |    4 ++--
- src/connectivity/bluetooth/ql2capserver.h          |    2 +-
- src/connectivity/bluetooth/ql2capserver_p.cpp      |    2 +-
- src/connectivity/bluetooth/ql2capserver_p.h        |    6 +++---
- src/connectivity/bluetooth/qrfcommserver.h         |    2 +-
- src/connectivity/bluetooth/qrfcommserver_p.cpp     |    2 +-
- src/connectivity/bluetooth/qrfcommserver_p.h       |    6 +++---
- tests/tests.pro                                    |    4 +++-
- 16 files changed, 29 insertions(+), 26 deletions(-)
-
-diff --git a/src/connectivity/bluetooth/bluetooth.pri b/src/connectivity/bluetooth/bluetooth.pri
-index 717a1ad..4fa2c15 100644
---- a/src/connectivity/bluetooth/bluetooth.pri
-+++ b/src/connectivity/bluetooth/bluetooth.pri
-@@ -103,6 +103,7 @@ symbian {
-     }
- } else:contains(bluez_enabled, yes):contains(QT_CONFIG, dbus) {
-     QT *= dbus
-+    DEFINES += QTM_BLUEZ_BLUETOOTH
- 
-     include(bluez/bluez.pri)
- 
-diff --git a/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent.h b/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent.h
-index a95c467..00cfd14 100644
---- a/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent.h
-+++ b/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent.h
-@@ -101,7 +101,7 @@ private:
-     Q_DECLARE_PRIVATE(QBluetoothDeviceDiscoveryAgent)
-     QBluetoothDeviceDiscoveryAgentPrivate *d_ptr;
- 
--#ifndef QT_NO_DBUS
-+#ifdef QTM_BLUEZ_BLUETOOTH
-     Q_PRIVATE_SLOT(d_func(), void _q_deviceFound(const QString &address, const QVariantMap &dict));
-     Q_PRIVATE_SLOT(d_func(), void _q_propertyChanged(const QString &name, const QDBusVariant &value));
- #endif
-diff --git a/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent_p.cpp b/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent_p.cpp
-index 6edbd16..512002d 100644
---- a/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent_p.cpp
-+++ b/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent_p.cpp
-@@ -69,7 +69,7 @@ void QBluetoothDeviceDiscoveryAgentPrivate::start()
- void QBluetoothDeviceDiscoveryAgentPrivate::stop()
- {
- }
--#ifndef QT_NO_DBUS
-+#ifdef QTM_BLUEZ_BLUETOOTH
- void QBluetoothDeviceDiscoveryAgentPrivate::_q_deviceFound(const QString &address,
-                                                            const QVariantMap &dict)
- {
-diff --git a/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent_p.h b/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent_p.h
-index 0e34e05..700e78d 100644
---- a/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent_p.h
-+++ b/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent_p.h
-@@ -46,7 +46,7 @@
- 
- #include <QVariantMap>
- 
--#ifndef QT_NO_DBUS
-+#ifdef QTM_BLUEZ_BLUETOOTH
- class OrgBluezManagerInterface;
- class OrgBluezAdapterInterface;
- class QDBusVariant;
-@@ -80,7 +80,7 @@ public:
-             QString errorDescription);
- #endif
- 
--#ifndef QT_NO_DBUS
-+#ifdef QTM_BLUEZ_BLUETOOTH
-     void _q_deviceFound(const QString &address, const QVariantMap &dict);
-     void _q_propertyChanged(const QString &name, const QDBusVariant &value);
- #endif
-@@ -100,7 +100,7 @@ private:
-     bool pendingCancel;
-     bool pendingStart;
- 
--#if !defined(QT_NO_DBUS)
-+#ifdef QTM_BLUEZ_BLUETOOTH
-     OrgBluezManagerInterface *manager;
-     OrgBluezAdapterInterface *adapter;
- #endif
-diff --git a/src/connectivity/bluetooth/qbluetoothlocaldevice_p.h b/src/connectivity/bluetooth/qbluetoothlocaldevice_p.h
-index 750c286..381d6b5 100644
---- a/src/connectivity/bluetooth/qbluetoothlocaldevice_p.h
-+++ b/src/connectivity/bluetooth/qbluetoothlocaldevice_p.h
-@@ -51,7 +51,7 @@
- #include <btengsettings.h>
- #endif
- 
--#ifndef QT_NO_DBUS
-+#ifdef QTM_BLUEZ_BLUETOOTH
- #include <QObject>
- #include <QDBusContext>
- #include <QDBusObjectPath>
-@@ -68,7 +68,7 @@ QTM_BEGIN_NAMESPACE
- 
- class QBluetoothAddress;
- 
--#ifndef QT_NO_DBUS
-+#ifdef QTM_BLUEZ_BLUETOOTH
- class QBluetoothLocalDevicePrivate : public QObject,
-                                      protected QDBusContext
- {
-diff --git a/src/connectivity/bluetooth/qbluetoothservicediscoveryagent.h b/src/connectivity/bluetooth/qbluetoothservicediscoveryagent.h
-index 6279432..7eeccfc 100644
---- a/src/connectivity/bluetooth/qbluetoothservicediscoveryagent.h
-+++ b/src/connectivity/bluetooth/qbluetoothservicediscoveryagent.h
-@@ -105,7 +105,7 @@ private:
-     Q_PRIVATE_SLOT(d_func(), void _q_deviceDiscovered(const QBluetoothDeviceInfo &info))
-     Q_PRIVATE_SLOT(d_func(), void _q_deviceDiscoveryFinished())
-     Q_PRIVATE_SLOT(d_func(), void _q_serviceDiscoveryFinished())
--#ifndef QT_NO_DBUS
-+#ifdef QTM_BLUEZ_BLUETOOTH
-     Q_PRIVATE_SLOT(d_func(), void _q_discoveredServices(QDBusPendingCallWatcher*))
-     Q_PRIVATE_SLOT(d_func(), void _q_createdDevice(QDBusPendingCallWatcher*))
- #endif
-diff --git a/src/connectivity/bluetooth/qbluetoothservicediscoveryagent_p.h b/src/connectivity/bluetooth/qbluetoothservicediscoveryagent_p.h
-index 5e7da43..f25c293 100644
---- a/src/connectivity/bluetooth/qbluetoothservicediscoveryagent_p.h
-+++ b/src/connectivity/bluetooth/qbluetoothservicediscoveryagent_p.h
-@@ -53,7 +53,7 @@
- #include <btsdp.h>
- #endif
- 
--#ifndef QT_NO_DBUS
-+#ifdef QTM_BLUEZ_BLUETOOTH
- class OrgBluezManagerInterface;
- class OrgBluezAdapterInterface;
- class OrgBluezDeviceInterface;
-@@ -99,7 +99,7 @@ public:
-     void _q_deviceDiscoveryFinished();
-     void _q_deviceDiscovered(const QBluetoothDeviceInfo &info);
-     void _q_serviceDiscoveryFinished();
--#ifndef QT_NO_DBUS
-+#ifdef QTM_BLUEZ_BLUETOOTH
-     void _q_discoveredServices(QDBusPendingCallWatcher *watcher);
-     void _q_createdDevice(QDBusPendingCallWatcher *watcher);
- #endif
-@@ -123,7 +123,7 @@ private:
- #ifdef QTM_SYMBIAN_BLUETOOTH
-     void startL(const QBluetoothAddress &address);
-     void initL(const QBluetoothAddress &address);
--#elif !defined(QT_NO_DBUS)
-+#elif defined(QTM_BLUEZ_BLUETOOTH)
-     QVariant readAttributeValue(QXmlStreamReader &xml);
- #endif
- 
-@@ -153,7 +153,7 @@ private:
-     TSdpAttributeID m_currentAttributeId;
- 
-     QStack<QVariant> m_stack;
--#elif !defined(QT_NO_DBUS)
-+#elif defined(QTM_BLUEZ_BLUETOOTH)
-     OrgBluezManagerInterface *manager;
-     OrgBluezAdapterInterface *adapter;
-     OrgBluezDeviceInterface *device;
-diff --git a/src/connectivity/bluetooth/qbluetoothserviceinfo_p.cpp b/src/connectivity/bluetooth/qbluetoothserviceinfo_p.cpp
-index 814458c..dd96dcc 100644
---- a/src/connectivity/bluetooth/qbluetoothserviceinfo_p.cpp
-+++ b/src/connectivity/bluetooth/qbluetoothserviceinfo_p.cpp
-@@ -79,7 +79,7 @@ void QBluetoothServiceInfoPrivate::removeRegisteredAttribute(quint16 attributeId
-     Q_UNUSED(attributeId);
- }
- 
--#ifndef QT_NO_DBUS
-+#ifdef QTM_BLUEZ_BLUETOOTH
- bool QBluetoothServiceInfoPrivate::registerService() const
- {
-     return false;
-diff --git a/src/connectivity/bluetooth/qbluetoothserviceinfo_p.h b/src/connectivity/bluetooth/qbluetoothserviceinfo_p.h
-index 5be7341..8e4254c 100644
---- a/src/connectivity/bluetooth/qbluetoothserviceinfo_p.h
-+++ b/src/connectivity/bluetooth/qbluetoothserviceinfo_p.h
-@@ -72,7 +72,7 @@ public:
- 
-     bool ensureSdpConnection() const;
- 
--#ifndef QT_NO_DBUS
-+#ifdef QTM_BLUEZ_BLUETOOTH
-     bool registerService() const;
- #endif
- 
-@@ -89,7 +89,7 @@ public:
-     mutable TSdpServRecordHandle serviceRecord;
- #endif
- 
--#ifndef QT_NO_DBUS
-+#ifdef QTM_BLUEZ_BLUETOOTH
-     mutable OrgBluezServiceInterface *service;
-     mutable quint32 serviceRecord;
-     mutable bool registered;
-diff --git a/src/connectivity/bluetooth/ql2capserver.h b/src/connectivity/bluetooth/ql2capserver.h
-index 99c20a5..bed65a3 100644
---- a/src/connectivity/bluetooth/ql2capserver.h
-+++ b/src/connectivity/bluetooth/ql2capserver.h
-@@ -97,7 +97,7 @@ private:
-     Q_PRIVATE_SLOT(d_func(), void _q_disconnected())
- #endif //QTM_SYMBIAN_BLUETOOTH
-     
--#ifndef QT_NO_DBUS
-+#ifdef QTM_BLUEZ_BLUETOOTH
-     Q_PRIVATE_SLOT(d_func(), void _q_newConnection())
- #endif
- 
-diff --git a/src/connectivity/bluetooth/ql2capserver_p.cpp b/src/connectivity/bluetooth/ql2capserver_p.cpp
-index 3a2199f..f19977e 100644
---- a/src/connectivity/bluetooth/ql2capserver_p.cpp
-+++ b/src/connectivity/bluetooth/ql2capserver_p.cpp
-@@ -101,7 +101,7 @@ QBluetooth::SecurityFlags QL2capServer::securityFlags() const
- 
- 
- 
--#ifndef QT_NO_DBUS
-+#ifdef QTM_BLUEZ_BLUETOOTH
- void QL2capServerPrivate::_q_newConnection()
- {
- }
-diff --git a/src/connectivity/bluetooth/ql2capserver_p.h b/src/connectivity/bluetooth/ql2capserver_p.h
-index b5e76d9..2823106 100644
---- a/src/connectivity/bluetooth/ql2capserver_p.h
-+++ b/src/connectivity/bluetooth/ql2capserver_p.h
-@@ -50,7 +50,7 @@
- #include <bt_sock.h>
- #endif //QTM_SYMBIAN_BLUETOOTH
- 
--#ifndef QT_NO_DBUS
-+#ifdef QTM_BLUEZ_BLUETOOTH
- QT_FORWARD_DECLARE_CLASS(QSocketNotifier)
- #endif
- 
-@@ -82,7 +82,7 @@ public:
-     void _q_disconnected();
- #endif //QTM_SYMBIAN_BLUETOOTH
-     
--#ifndef QT_NO_DBUS
-+#ifdef QTM_BLUEZ_BLUETOOTH
-     void _q_newConnection();
- #endif
- 
-@@ -103,7 +103,7 @@ protected:
-     QL2capServer *q_ptr;
- 
- private:
--#ifndef QT_NO_DBUS
-+#ifdef QTM_BLUEZ_BLUETOOTH
-     QSocketNotifier *socketNotifier;
- #endif
- };
-diff --git a/src/connectivity/bluetooth/qrfcommserver.h b/src/connectivity/bluetooth/qrfcommserver.h
-index 3f348dd..7974ba6 100644
---- a/src/connectivity/bluetooth/qrfcommserver.h
-+++ b/src/connectivity/bluetooth/qrfcommserver.h
-@@ -97,7 +97,7 @@ private:
-     Q_PRIVATE_SLOT(d_func(), void _q_disconnected())
- #endif //QTM_SYMBIAN_BLUETOOTH  
-     
--#ifndef QT_NO_DBUS
-+#ifdef QTM_BLUEZ_BLUETOOTH
-     Q_PRIVATE_SLOT(d_func(), void _q_newConnection())
- #endif
- };
-diff --git a/src/connectivity/bluetooth/qrfcommserver_p.cpp b/src/connectivity/bluetooth/qrfcommserver_p.cpp
-index f8145d9..eb14d64 100644
---- a/src/connectivity/bluetooth/qrfcommserver_p.cpp
-+++ b/src/connectivity/bluetooth/qrfcommserver_p.cpp
-@@ -90,7 +90,7 @@ quint16 QRfcommServer::serverPort() const
- }
- 
- 
--#ifndef QT_NO_DBUS
-+#ifdef QTM_BLUEZ_BLUETOOTH
- void QRfcommServerPrivate::_q_newConnection()
- {
- }
-diff --git a/src/connectivity/bluetooth/qrfcommserver_p.h b/src/connectivity/bluetooth/qrfcommserver_p.h
-index da6e28b..af40df7 100644
---- a/src/connectivity/bluetooth/qrfcommserver_p.h
-+++ b/src/connectivity/bluetooth/qrfcommserver_p.h
-@@ -51,7 +51,7 @@
- #include <bt_sock.h>
- #endif
- 
--#ifndef QT_NO_DBUS
-+#ifdef QTM_BLUEZ_BLUETOOTH
- QT_FORWARD_DECLARE_CLASS(QSocketNotifier)
- #endif
- 
-@@ -83,7 +83,7 @@ public:
-     void _q_disconnected();
- #endif //QTM_SYMBIAN_BLUETOOTH
- 
--#ifndef QT_NO_DBUS
-+#ifdef QTM_BLUEZ_BLUETOOTH
-     void _q_newConnection();
- #endif
- 
-@@ -102,7 +102,7 @@ protected:
-     QRfcommServer *q_ptr;
- 
- private:
--#ifndef QT_NO_DBUS
-+#ifdef QTM_BLUEZ_BLUETOOTH
-     QSocketNotifier *socketNotifier;
- #endif
- };
-diff --git a/tests/tests.pro b/tests/tests.pro
-index 2f2c355..4800e5e 100644
---- a/tests/tests.pro
-+++ b/tests/tests.pro
-@@ -16,7 +16,9 @@ contains(mobility_modules,systeminfo): SUBDIRS += sysinfo-tester
- contains(mobility_modules,connectivity) {
-     SUBDIRS += nfctestserver
- 
--    linux*:!linux-armcc: SUBDIRS += btclient
-+    linux*:!linux-armcc:contains(bluez_enabled, yes):contains(QT_CONFIG, dbus) {
-+        SUBDIRS += btclient
-+    }
- }
- 
- symbian {
--- 
-1.7.1
-
diff --git a/meta/recipes-qt/qt4/qt-mobility-1.2.0/fix_metaobjectbuilder_build_err.patch b/meta/recipes-qt/qt4/qt-mobility-1.2.0/fix_metaobjectbuilder_build_err.patch
deleted file mode 100644
index cffb06706f..0000000000
--- a/meta/recipes-qt/qt4/qt-mobility-1.2.0/fix_metaobjectbuilder_build_err.patch
+++ /dev/null
@@ -1,4707 +0,0 @@
-Fix metaobjectbuilder build errors against Qt 4.8 and 4.7
-
-Error message:
-ipc/qmetaobjectbuilder.cpp:803:65: error: invalid conversion from \
-'QMetaObjectExtraData::StaticMetacallFunction {aka void (*)(QObject*, \
-QMetaObject::Call, int, void**)}' to 'QtMobility::QMetaObjectBuilder:: \
-StaticMetacallFunction {aka int (*)(QMetaObject::Call, int, void**)}
-
-Upstream-commit:
-http://qt.gitorious.org/qt-mobility/qt-mobility/commit/f102053b28009b3094b0e5777177208afa6097c5
-
-Task-number: QTMOBILITY-1990
-
-Upstream-Status: Backport
-
-Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
-------------------------------------------------------
-diff --git a/plugins/declarative/common/dynamicproperties.pri b/plugins/declarative/common/dynamicproperties.pri
-index 52737a3..4bd06de 100644
---- a/plugins/declarative/common/dynamicproperties.pri
-+++ b/plugins/declarative/common/dynamicproperties.pri
-@@ -1,6 +1,8 @@
- INCLUDEPATH += ../../../plugins/declarative/common/dynamicproperties/
--HEADERS += ../../../plugins/declarative/common/dynamicproperties/qdeclarativeopenmetaobject_p.h \
--	   ../../../plugins/declarative/common/dynamicproperties/qmetaobjectbuilder_p.h
--SOURCES += ../../../plugins/declarative/common/dynamicproperties/qdeclarativeopenmetaobject.cpp \
--           ../../../src/serviceframework/ipc/qmetaobjectbuilder.cpp
--
-+HEADERS += ../../../plugins/declarative/common/dynamicproperties/qdeclarativeopenmetaobject_p.h
-+SOURCES += ../../../plugins/declarative/common/dynamicproperties/qdeclarativeopenmetaobject.cpp
-+include(../../../src/serviceframework/ipc/metaobjectbuilder.pri)
-+INCLUDEPATH += ../../../src/serviceframework/$$OBJECTBUILDER_INCLUDEPATH
-+DEPENDPATH += ../../../src/serviceframework/$$OBJECTBUILDER_DEPENDPATH
-+HEADERS += ../../../src/serviceframework/$$OBJECTBUILDER_HEADERS
-+SOURCES += ../../../src/serviceframework/$$OBJECTBUILDER_SOURCES
-diff --git a/plugins/declarative/common/dynamicproperties/qdeclarativeopenmetaobject.cpp b/plugins/declarative/common/dynamicproperties/qdeclarativeopenmetaobject.cpp
-index 79a2064..9eb6810 100644
---- a/plugins/declarative/common/dynamicproperties/qdeclarativeopenmetaobject.cpp
-+++ b/plugins/declarative/common/dynamicproperties/qdeclarativeopenmetaobject.cpp
-@@ -65,8 +65,7 @@ public:
-     {
-         int id = mob.propertyCount();
-         mob.addSignal("__" + QByteArray::number(id) + "()");
--        QMetaPropertyBuilder build = mob.addProperty(name, type, id);
--        build.setDynamic(true);
-+        mob.addProperty(name, type, id);
-         qFree(mem);
-         mem = mob.toMetaObject();
- 
-diff --git a/plugins/declarative/common/dynamicproperties/qmetaobjectbuilder_p.h b/plugins/declarative/common/dynamicproperties/qmetaobjectbuilder_p.h
-deleted file mode 100644
-index bd937e4..0000000
---- a/plugins/declarative/common/dynamicproperties/qmetaobjectbuilder_p.h
-+++ /dev/null
-@@ -1,48 +0,0 @@
--/****************************************************************************
--**
--** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
--** All rights reserved.
--** Contact: Nokia Corporation (qt-info@nokia.com)
--**
--** This file is part of the Qt Mobility Components.
--**
--** $QT_BEGIN_LICENSE:LGPL$
--** No Commercial Usage
--** This file contains pre-release code and may not be distributed.
--** You may use this file in accordance with the terms and conditions
--** contained in the Technology Preview License Agreement accompanying
--** this package.
--**
--** GNU Lesser General Public License Usage
--** Alternatively, this file may be used under the terms of the GNU Lesser
--** General Public License version 2.1 as published by the Free Software
--** Foundation and appearing in the file LICENSE.LGPL included in the
--** packaging of this file.  Please review the following information to
--** ensure the GNU Lesser General Public License version 2.1 requirements
--** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
--**
--** In addition, as a special exception, Nokia gives you certain additional
--** rights.  These rights are described in the Nokia Qt LGPL Exception
--** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
--**
--** If you have questions regarding the use of this file, please contact
--** Nokia at qt-info@nokia.com.
--**
--**
--**
--**
--**
--**
--**
--**
--** $QT_END_LICENSE$
--**
--****************************************************************************/
--
--/*
--This header gets used in a number of different QML plugins
--and also in the source tree of Mobility itself.
--
--So this header is just a wrapper to grab it from there.
--*/
--#include "../../../../src/serviceframework/ipc/qmetaobjectbuilder_p.h"
-diff --git a/src/serviceframework/ipc/ipc.pri b/src/serviceframework/ipc/ipc.pri
-index 28b910f..d809f59 100644
---- a/src/serviceframework/ipc/ipc.pri
-+++ b/src/serviceframework/ipc/ipc.pri
-@@ -25,9 +25,14 @@ else {
-     }
- }
- 
-+include(metaobjectbuilder.pri)
-+INCLUDEPATH += $$OBJECTBUILDER_INCLUDEPATH
-+DEPENDPATH += $$OBJECTBUILDER_DEPENDPATH
-+PRIVATE_HEADERS += $$OBJECTBUILDER_HEADERS
-+SOURCES += $$OBJECTBUILDER_SOURCES
-+
- PRIVATE_HEADERS += ipc/qslotinvoker_p.h \
-     ipc/qsignalintercepter_p.h \
--    ipc/qmetaobjectbuilder_p.h \
-     ipc/instancemanager_p.h \
-     ipc/qservicepackage_p.h \
-     ipc/proxyobject_p.h \
-@@ -37,7 +42,6 @@ PRIVATE_HEADERS += ipc/qslotinvoker_p.h \
- 
- SOURCES += ipc/qslotinvoker.cpp \
-     ipc/qsignalintercepter.cpp \
--    ipc/qmetaobjectbuilder.cpp \
-     ipc/instancemanager.cpp \
-     ipc/qservicepackage.cpp \
-     ipc/proxyobject.cpp \
-diff --git a/src/serviceframework/ipc/metaobjectbuilder.pri b/src/serviceframework/ipc/metaobjectbuilder.pri
-new file mode 100644
-index 0000000..cc905f9
---- /dev/null
-+++ b/src/serviceframework/ipc/metaobjectbuilder.pri
-@@ -0,0 +1,12 @@
-+#check version for 4.7 ...
-+contains(QT_MAJOR_VERSION, 4):lessThan(QT_MINOR_VERSION, 8) {
-+  OBJECTBUILDER_INCLUDEPATH += ipc
-+  OBJECTBUILDER_DEPENDPATH += ipc
-+  OBJECTBUILDER_HEADERS += ipc/qmetaobjectbuilder_47_p.h
-+  OBJECTBUILDER_SOURCES += ipc/qmetaobjectbuilder_47.cpp
-+} else {
-+  OBJECTBUILDER_INCLUDEPATH += ipc
-+  OBJECTBUILDER_DEPENDPATH += ipc
-+  OBJECTBUILDER_HEADERS += ipc/qmetaobjectbuilder_p.h
-+  OBJECTBUILDER_SOURCES += ipc/qmetaobjectbuilder.cpp
-+}
-diff --git a/src/serviceframework/ipc/qmetaobjectbuilder.cpp b/src/serviceframework/ipc/qmetaobjectbuilder.cpp
-index b19eb1a..6ffaa20 100644
---- a/src/serviceframework/ipc/qmetaobjectbuilder.cpp
-+++ b/src/serviceframework/ipc/qmetaobjectbuilder.cpp
-@@ -117,6 +117,8 @@ enum PropertyFlags  {
-     EnumOrFlag = 0x00000008,
-     StdCppSet = 0x00000100,
- //    Override = 0x00000200,
-+    Constant = 0x00000400,
-+    Final = 0x00000800,
-     Designable = 0x00001000,
-     ResolveDesignable = 0x00002000,
-     Scriptable = 0x00004000,
-@@ -128,7 +130,7 @@ enum PropertyFlags  {
-     User = 0x00100000,
-     ResolveUser = 0x00200000,
-     Notify = 0x00400000,
--    Dynamic = 0x00800000
-+    Revisioned = 0x00800000
- };
- 
- enum MethodFlags  {
-@@ -145,7 +147,8 @@ enum MethodFlags  {
- 
-     MethodCompatibility = 0x10,
-     MethodCloned = 0x20,
--    MethodScriptable = 0x40
-+    MethodScriptable = 0x40,
-+    MethodRevisioned = 0x80
- };
- 
- struct QMetaObjectPrivate
-@@ -623,6 +626,8 @@ QMetaPropertyBuilder QMetaObjectBuilder::addProperty(const QMetaProperty& protot
-     property.setUser(prototype.isUser());
-     property.setStdCppSet(prototype.hasStdCppSet());
-     property.setEnumOrFlag(prototype.isEnumType());
-+    property.setConstant(prototype.isConstant());
-+    property.setFinal(prototype.isFinal());
-     if (prototype.hasNotifySignal()) {
-         // Find an existing method for the notify signal, or add a new one.
-         QMetaMethod method = prototype.notifySignal();
-@@ -796,7 +801,7 @@ void QMetaObjectBuilder::addMetaObject
-     }
- 
-     if ((members & StaticMetacall) != 0) {
--        if (priv(prototype->d.data)->revision >= 2) {
-+        if (priv(prototype->d.data)->revision >= 6) {
-             const QMetaObjectExtraData *extra =
-                 (const QMetaObjectExtraData *)(prototype->d.extradata);
-             if (extra && extra->static_metacall)
-@@ -1266,8 +1271,8 @@ static int buildMetaObject(QMetaObjectBuilderPrivate *d, char *buf,
-     char *str = reinterpret_cast<char *>(buf + size);
-     if (buf) {
-         if (relocatable) {
--            meta->d.stringdata = reinterpret_cast<const char *>((intptr_t)size);
--            meta->d.data = reinterpret_cast<uint *>((intptr_t)pmetaSize);
-+            meta->d.stringdata = reinterpret_cast<const char *>((quintptr)size);
-+            meta->d.data = reinterpret_cast<uint *>((quintptr)pmetaSize);
-         } else {
-             meta->d.stringdata = str;
-             meta->d.data = reinterpret_cast<uint *>(data);
-@@ -1504,8 +1509,8 @@ void QMetaObjectBuilder::fromRelocatableData(QMetaObject *output,
-     const char *buf = data.constData();
-     const QMetaObject *dataMo = reinterpret_cast<const QMetaObject *>(buf);
- 
--    intptr_t stringdataOffset = (intptr_t)dataMo->d.stringdata;
--    intptr_t dataOffset = (intptr_t)dataMo->d.data;
-+    quintptr stringdataOffset = (quintptr)dataMo->d.stringdata;
-+    quintptr dataOffset = (quintptr)dataMo->d.data;
- 
-     output->d.superdata = superclass;
-     output->d.stringdata = buf + stringdataOffset;
-@@ -2289,16 +2294,27 @@ bool QMetaPropertyBuilder::isEnumOrFlag() const
- }
- 
- /*!
--    Returns true if the property has the dynamic flag set;
--    otherwise returns false.  The default value is false.
-+    Returns true if the property is constant; otherwise returns false.
-+    The default value is false.
-+*/
-+bool QMetaPropertyBuilder::isConstant() const
-+{
-+    QMetaPropertyBuilderPrivate *d = d_func();
-+    if (d)
-+        return d->flag(Constant);
-+    else
-+        return false;
-+}
- 
--    \sa setDynamic()
-+/*!
-+    Returns true if the property is final; otherwise returns false.
-+    The default value is false.
- */
--bool QMetaPropertyBuilder::isDynamic() const
-+bool QMetaPropertyBuilder::isFinal() const
- {
-     QMetaPropertyBuilderPrivate *d = d_func();
-     if (d)
--        return d->flag(Dynamic);
-+        return d->flag(Final);
-     else
-         return false;
- }
-@@ -2427,16 +2443,27 @@ void QMetaPropertyBuilder::setEnumOrFlag(bool value)
- }
- 
- /*!
--    Sets this property to have the dynamic flag if \a value is
--    true.
-+    Sets the \c CONSTANT flag on this property to \a value.
-+
-+    \sa isConstant()
-+*/
-+void QMetaPropertyBuilder::setConstant(bool value)
-+{
-+    QMetaPropertyBuilderPrivate *d = d_func();
-+    if (d)
-+        d->setFlag(Constant, value);
-+}
-+
-+/*!
-+    Sets the \c FINAL flag on this property to \a value.
- 
--    \sa isDynamic()
-+    \sa isFinal()
- */
--void QMetaPropertyBuilder::setDynamic(bool value)
-+void QMetaPropertyBuilder::setFinal(bool value)
- {
-     QMetaPropertyBuilderPrivate *d = d_func();
-     if (d)
--        d->setFlag(Dynamic, value);
-+        d->setFlag(Final, value);
- }
- 
- /*!
-diff --git a/src/serviceframework/ipc/qmetaobjectbuilder_47.cpp b/src/serviceframework/ipc/qmetaobjectbuilder_47.cpp
-new file mode 100644
-index 0000000..509d6c6
---- /dev/null
-+++ b/src/serviceframework/ipc/qmetaobjectbuilder_47.cpp
-@@ -0,0 +1,2583 @@
-+/****************************************************************************
-+**
-+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-+** All rights reserved.
-+** Contact: Nokia Corporation (qt-info@nokia.com)
-+**
-+** This file is part of the QtDeclarative module of the Qt Toolkit.
-+**
-+** $QT_BEGIN_LICENSE:LGPL$
-+** No Commercial Usage
-+** This file contains pre-release code and may not be distributed.
-+** You may use this file in accordance with the terms and conditions
-+** contained in the Technology Preview License Agreement accompanying
-+** this package.
-+**
-+** GNU Lesser General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU Lesser
-+** General Public License version 2.1 as published by the Free Software
-+** Foundation and appearing in the file LICENSE.LGPL included in the
-+** packaging of this file.  Please review the following information to
-+** ensure the GNU Lesser General Public License version 2.1 requirements
-+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-+**
-+** In addition, as a special exception, Nokia gives you certain additional
-+** rights.  These rights are described in the Nokia Qt LGPL Exception
-+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-+**
-+** If you have questions regarding the use of this file, please contact
-+** Nokia at qt-info@nokia.com.
-+**
-+**
-+**
-+**
-+**
-+**
-+**
-+**
-+** $QT_END_LICENSE$
-+**
-+****************************************************************************/
-+
-+#include "qmetaobjectbuilder_47_p.h"
-+#include &l