summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-17 21:26:27 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-19 07:51:38 +0000
commitc4cc479beb5970672f52f80ce5f77376d58861bc (patch)
tree2f01ac9b98b3864b5d3c80c501bc0c681be64fbd /meta/recipes-qt
parent26be755cb5c177e4452ae1d4a9780824df27970e (diff)
downloadpoky-c4cc479beb5970672f52f80ce5f77376d58861bc.tar.gz
qt-mobility: Add patch to fix disabling bluez compile issues
If you disable bluez but have dbus enabled, the build would fail. This patch fixes the issue so that bluez5 based builds work. (From OE-Core rev: 1324839b2be97c19e0a1fbd6ec8d3357731e5973) Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt')
-rw-r--r--meta/recipes-qt/qt4/qt-mobility-1.2.0/fix-compile-error-no-bluez.patch338
-rw-r--r--meta/recipes-qt/qt4/qt-mobility_1.2.0.inc1
2 files changed, 339 insertions, 0 deletions
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
new file mode 100644
index 0000000000..3f03cf7165
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt-mobility-1.2.0/fix-compile-error-no-bluez.patch
@@ -0,0 +1,338 @@
1From bb05733bd5a685b00f80ddc73a1b7a9a2ba0eb11 Mon Sep 17 00:00:00 2001
2From: Andrew Stanley-Jones <andrew.stanley-jones@nokia.com>
3Date: Thu, 12 May 2011 13:07:13 +1000
4Subject: [PATCH] Fix compile error if bluez is not installed
5
6Upstream-Status: Backport
7
8Task-number: QTMOBILITY-1576
9---
10 src/connectivity/bluetooth/bluetooth.pri | 1 +
11 .../bluetooth/qbluetoothdevicediscoveryagent.h | 2 +-
12 .../bluetooth/qbluetoothdevicediscoveryagent_p.cpp | 2 +-
13 .../bluetooth/qbluetoothdevicediscoveryagent_p.h | 6 +++---
14 .../bluetooth/qbluetoothlocaldevice_p.h | 4 ++--
15 .../bluetooth/qbluetoothservicediscoveryagent.h | 2 +-
16 .../bluetooth/qbluetoothservicediscoveryagent_p.h | 8 ++++----
17 .../bluetooth/qbluetoothserviceinfo_p.cpp | 2 +-
18 .../bluetooth/qbluetoothserviceinfo_p.h | 4 ++--
19 src/connectivity/bluetooth/ql2capserver.h | 2 +-
20 src/connectivity/bluetooth/ql2capserver_p.cpp | 2 +-
21 src/connectivity/bluetooth/ql2capserver_p.h | 6 +++---
22 src/connectivity/bluetooth/qrfcommserver.h | 2 +-
23 src/connectivity/bluetooth/qrfcommserver_p.cpp | 2 +-
24 src/connectivity/bluetooth/qrfcommserver_p.h | 6 +++---
25 tests/tests.pro | 4 +++-
26 16 files changed, 29 insertions(+), 26 deletions(-)
27
28diff --git a/src/connectivity/bluetooth/bluetooth.pri b/src/connectivity/bluetooth/bluetooth.pri
29index 717a1ad..4fa2c15 100644
30--- a/src/connectivity/bluetooth/bluetooth.pri
31+++ b/src/connectivity/bluetooth/bluetooth.pri
32@@ -103,6 +103,7 @@ symbian {
33 }
34 } else:contains(bluez_enabled, yes):contains(QT_CONFIG, dbus) {
35 QT *= dbus
36+ DEFINES += QTM_BLUEZ_BLUETOOTH
37
38 include(bluez/bluez.pri)
39
40diff --git a/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent.h b/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent.h
41index a95c467..00cfd14 100644
42--- a/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent.h
43+++ b/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent.h
44@@ -101,7 +101,7 @@ private:
45 Q_DECLARE_PRIVATE(QBluetoothDeviceDiscoveryAgent)
46 QBluetoothDeviceDiscoveryAgentPrivate *d_ptr;
47
48-#ifndef QT_NO_DBUS
49+#ifdef QTM_BLUEZ_BLUETOOTH
50 Q_PRIVATE_SLOT(d_func(), void _q_deviceFound(const QString &address, const QVariantMap &dict));
51 Q_PRIVATE_SLOT(d_func(), void _q_propertyChanged(const QString &name, const QDBusVariant &value));
52 #endif
53diff --git a/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent_p.cpp b/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent_p.cpp
54index 6edbd16..512002d 100644
55--- a/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent_p.cpp
56+++ b/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent_p.cpp
57@@ -69,7 +69,7 @@ void QBluetoothDeviceDiscoveryAgentPrivate::start()
58 void QBluetoothDeviceDiscoveryAgentPrivate::stop()
59 {
60 }
61-#ifndef QT_NO_DBUS
62+#ifdef QTM_BLUEZ_BLUETOOTH
63 void QBluetoothDeviceDiscoveryAgentPrivate::_q_deviceFound(const QString &address,
64 const QVariantMap &dict)
65 {
66diff --git a/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent_p.h b/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent_p.h
67index 0e34e05..700e78d 100644
68--- a/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent_p.h
69+++ b/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent_p.h
70@@ -46,7 +46,7 @@
71
72 #include <QVariantMap>
73
74-#ifndef QT_NO_DBUS
75+#ifdef QTM_BLUEZ_BLUETOOTH
76 class OrgBluezManagerInterface;
77 class OrgBluezAdapterInterface;
78 class QDBusVariant;
79@@ -80,7 +80,7 @@ public:
80 QString errorDescription);
81 #endif
82
83-#ifndef QT_NO_DBUS
84+#ifdef QTM_BLUEZ_BLUETOOTH
85 void _q_deviceFound(const QString &address, const QVariantMap &dict);
86 void _q_propertyChanged(const QString &name, const QDBusVariant &value);
87 #endif
88@@ -100,7 +100,7 @@ private:
89 bool pendingCancel;
90 bool pendingStart;
91
92-#if !defined(QT_NO_DBUS)
93+#ifdef QTM_BLUEZ_BLUETOOTH
94 OrgBluezManagerInterface *manager;
95 OrgBluezAdapterInterface *adapter;
96 #endif
97diff --git a/src/connectivity/bluetooth/qbluetoothlocaldevice_p.h b/src/connectivity/bluetooth/qbluetoothlocaldevice_p.h
98index 750c286..381d6b5 100644
99--- a/src/connectivity/bluetooth/qbluetoothlocaldevice_p.h
100+++ b/src/connectivity/bluetooth/qbluetoothlocaldevice_p.h
101@@ -51,7 +51,7 @@
102 #include <btengsettings.h>
103 #endif
104
105-#ifndef QT_NO_DBUS
106+#ifdef QTM_BLUEZ_BLUETOOTH
107 #include <QObject>
108 #include <QDBusContext>
109 #include <QDBusObjectPath>
110@@ -68,7 +68,7 @@ QTM_BEGIN_NAMESPACE
111
112 class QBluetoothAddress;
113
114-#ifndef QT_NO_DBUS
115+#ifdef QTM_BLUEZ_BLUETOOTH
116 class QBluetoothLocalDevicePrivate : public QObject,
117 protected QDBusContext
118 {
119diff --git a/src/connectivity/bluetooth/qbluetoothservicediscoveryagent.h b/src/connectivity/bluetooth/qbluetoothservicediscoveryagent.h
120index 6279432..7eeccfc 100644
121--- a/src/connectivity/bluetooth/qbluetoothservicediscoveryagent.h
122+++ b/src/connectivity/bluetooth/qbluetoothservicediscoveryagent.h
123@@ -105,7 +105,7 @@ private:
124 Q_PRIVATE_SLOT(d_func(), void _q_deviceDiscovered(const QBluetoothDeviceInfo &info))
125 Q_PRIVATE_SLOT(d_func(), void _q_deviceDiscoveryFinished())
126 Q_PRIVATE_SLOT(d_func(), void _q_serviceDiscoveryFinished())
127-#ifndef QT_NO_DBUS
128+#ifdef QTM_BLUEZ_BLUETOOTH
129 Q_PRIVATE_SLOT(d_func(), void _q_discoveredServices(QDBusPendingCallWatcher*))
130 Q_PRIVATE_SLOT(d_func(), void _q_createdDevice(QDBusPendingCallWatcher*))
131 #endif
132diff --git a/src/connectivity/bluetooth/qbluetoothservicediscoveryagent_p.h b/src/connectivity/bluetooth/qbluetoothservicediscoveryagent_p.h
133index 5e7da43..f25c293 100644
134--- a/src/connectivity/bluetooth/qbluetoothservicediscoveryagent_p.h
135+++ b/src/connectivity/bluetooth/qbluetoothservicediscoveryagent_p.h
136@@ -53,7 +53,7 @@
137 #include <btsdp.h>
138 #endif
139
140-#ifndef QT_NO_DBUS
141+#ifdef QTM_BLUEZ_BLUETOOTH
142 class OrgBluezManagerInterface;
143 class OrgBluezAdapterInterface;
144 class OrgBluezDeviceInterface;
145@@ -99,7 +99,7 @@ public:
146 void _q_deviceDiscoveryFinished();
147 void _q_deviceDiscovered(const QBluetoothDeviceInfo &info);
148 void _q_serviceDiscoveryFinished();
149-#ifndef QT_NO_DBUS
150+#ifdef QTM_BLUEZ_BLUETOOTH
151 void _q_discoveredServices(QDBusPendingCallWatcher *watcher);
152 void _q_createdDevice(QDBusPendingCallWatcher *watcher);
153 #endif
154@@ -123,7 +123,7 @@ private:
155 #ifdef QTM_SYMBIAN_BLUETOOTH
156 void startL(const QBluetoothAddress &address);
157 void initL(const QBluetoothAddress &address);
158-#elif !defined(QT_NO_DBUS)
159+#elif defined(QTM_BLUEZ_BLUETOOTH)
160 QVariant readAttributeValue(QXmlStreamReader &xml);
161 #endif
162
163@@ -153,7 +153,7 @@ private:
164 TSdpAttributeID m_currentAttributeId;
165
166 QStack<QVariant> m_stack;
167-#elif !defined(QT_NO_DBUS)
168+#elif defined(QTM_BLUEZ_BLUETOOTH)
169 OrgBluezManagerInterface *manager;
170 OrgBluezAdapterInterface *adapter;
171 OrgBluezDeviceInterface *device;
172diff --git a/src/connectivity/bluetooth/qbluetoothserviceinfo_p.cpp b/src/connectivity/bluetooth/qbluetoothserviceinfo_p.cpp
173index 814458c..dd96dcc 100644
174--- a/src/connectivity/bluetooth/qbluetoothserviceinfo_p.cpp
175+++ b/src/connectivity/bluetooth/qbluetoothserviceinfo_p.cpp
176@@ -79,7 +79,7 @@ void QBluetoothServiceInfoPrivate::removeRegisteredAttribute(quint16 attributeId
177 Q_UNUSED(attributeId);
178 }
179
180-#ifndef QT_NO_DBUS
181+#ifdef QTM_BLUEZ_BLUETOOTH
182 bool QBluetoothServiceInfoPrivate::registerService() const
183 {
184 return false;
185diff --git a/src/connectivity/bluetooth/qbluetoothserviceinfo_p.h b/src/connectivity/bluetooth/qbluetoothserviceinfo_p.h
186index 5be7341..8e4254c 100644
187--- a/src/connectivity/bluetooth/qbluetoothserviceinfo_p.h
188+++ b/src/connectivity/bluetooth/qbluetoothserviceinfo_p.h
189@@ -72,7 +72,7 @@ public:
190
191 bool ensureSdpConnection() const;
192
193-#ifndef QT_NO_DBUS
194+#ifdef QTM_BLUEZ_BLUETOOTH
195 bool registerService() const;
196 #endif
197
198@@ -89,7 +89,7 @@ public:
199 mutable TSdpServRecordHandle serviceRecord;
200 #endif
201
202-#ifndef QT_NO_DBUS
203+#ifdef QTM_BLUEZ_BLUETOOTH
204 mutable OrgBluezServiceInterface *service;
205 mutable quint32 serviceRecord;
206 mutable bool registered;
207diff --git a/src/connectivity/bluetooth/ql2capserver.h b/src/connectivity/bluetooth/ql2capserver.h
208index 99c20a5..bed65a3 100644
209--- a/src/connectivity/bluetooth/ql2capserver.h
210+++ b/src/connectivity/bluetooth/ql2capserver.h
211@@ -97,7 +97,7 @@ private:
212 Q_PRIVATE_SLOT(d_func(), void _q_disconnected())
213 #endif //QTM_SYMBIAN_BLUETOOTH
214
215-#ifndef QT_NO_DBUS
216+#ifdef QTM_BLUEZ_BLUETOOTH
217 Q_PRIVATE_SLOT(d_func(), void _q_newConnection())
218 #endif
219
220diff --git a/src/connectivity/bluetooth/ql2capserver_p.cpp b/src/connectivity/bluetooth/ql2capserver_p.cpp
221index 3a2199f..f19977e 100644
222--- a/src/connectivity/bluetooth/ql2capserver_p.cpp
223+++ b/src/connectivity/bluetooth/ql2capserver_p.cpp
224@@ -101,7 +101,7 @@ QBluetooth::SecurityFlags QL2capServer::securityFlags() const
225
226
227
228-#ifndef QT_NO_DBUS
229+#ifdef QTM_BLUEZ_BLUETOOTH
230 void QL2capServerPrivate::_q_newConnection()
231 {
232 }
233diff --git a/src/connectivity/bluetooth/ql2capserver_p.h b/src/connectivity/bluetooth/ql2capserver_p.h
234index b5e76d9..2823106 100644
235--- a/src/connectivity/bluetooth/ql2capserver_p.h
236+++ b/src/connectivity/bluetooth/ql2capserver_p.h
237@@ -50,7 +50,7 @@
238 #include <bt_sock.h>
239 #endif //QTM_SYMBIAN_BLUETOOTH
240
241-#ifndef QT_NO_DBUS
242+#ifdef QTM_BLUEZ_BLUETOOTH
243 QT_FORWARD_DECLARE_CLASS(QSocketNotifier)
244 #endif
245
246@@ -82,7 +82,7 @@ public:
247 void _q_disconnected();
248 #endif //QTM_SYMBIAN_BLUETOOTH
249
250-#ifndef QT_NO_DBUS
251+#ifdef QTM_BLUEZ_BLUETOOTH
252 void _q_newConnection();
253 #endif
254
255@@ -103,7 +103,7 @@ protected:
256 QL2capServer *q_ptr;
257
258 private:
259-#ifndef QT_NO_DBUS
260+#ifdef QTM_BLUEZ_BLUETOOTH
261 QSocketNotifier *socketNotifier;
262 #endif
263 };
264diff --git a/src/connectivity/bluetooth/qrfcommserver.h b/src/connectivity/bluetooth/qrfcommserver.h
265index 3f348dd..7974ba6 100644
266--- a/src/connectivity/bluetooth/qrfcommserver.h
267+++ b/src/connectivity/bluetooth/qrfcommserver.h
268@@ -97,7 +97,7 @@ private:
269 Q_PRIVATE_SLOT(d_func(), void _q_disconnected())
270 #endif //QTM_SYMBIAN_BLUETOOTH
271
272-#ifndef QT_NO_DBUS
273+#ifdef QTM_BLUEZ_BLUETOOTH
274 Q_PRIVATE_SLOT(d_func(), void _q_newConnection())
275 #endif
276 };
277diff --git a/src/connectivity/bluetooth/qrfcommserver_p.cpp b/src/connectivity/bluetooth/qrfcommserver_p.cpp
278index f8145d9..eb14d64 100644
279--- a/src/connectivity/bluetooth/qrfcommserver_p.cpp
280+++ b/src/connectivity/bluetooth/qrfcommserver_p.cpp
281@@ -90,7 +90,7 @@ quint16 QRfcommServer::serverPort() const
282 }
283
284
285-#ifndef QT_NO_DBUS
286+#ifdef QTM_BLUEZ_BLUETOOTH
287 void QRfcommServerPrivate::_q_newConnection()
288 {
289 }
290diff --git a/src/connectivity/bluetooth/qrfcommserver_p.h b/src/connectivity/bluetooth/qrfcommserver_p.h
291index da6e28b..af40df7 100644
292--- a/src/connectivity/bluetooth/qrfcommserver_p.h
293+++ b/src/connectivity/bluetooth/qrfcommserver_p.h
294@@ -51,7 +51,7 @@
295 #include <bt_sock.h>
296 #endif
297
298-#ifndef QT_NO_DBUS
299+#ifdef QTM_BLUEZ_BLUETOOTH
300 QT_FORWARD_DECLARE_CLASS(QSocketNotifier)
301 #endif
302
303@@ -83,7 +83,7 @@ public:
304 void _q_disconnected();
305 #endif //QTM_SYMBIAN_BLUETOOTH
306
307-#ifndef QT_NO_DBUS
308+#ifdef QTM_BLUEZ_BLUETOOTH
309 void _q_newConnection();
310 #endif
311
312@@ -102,7 +102,7 @@ protected:
313 QRfcommServer *q_ptr;
314
315 private:
316-#ifndef QT_NO_DBUS
317+#ifdef QTM_BLUEZ_BLUETOOTH
318 QSocketNotifier *socketNotifier;
319 #endif
320 };
321diff --git a/tests/tests.pro b/tests/tests.pro
322index 2f2c355..4800e5e 100644
323--- a/tests/tests.pro
324+++ b/tests/tests.pro
325@@ -16,7 +16,9 @@ contains(mobility_modules,systeminfo): SUBDIRS += sysinfo-tester
326 contains(mobility_modules,connectivity) {
327 SUBDIRS += nfctestserver
328
329- linux*:!linux-armcc: SUBDIRS += btclient
330+ linux*:!linux-armcc:contains(bluez_enabled, yes):contains(QT_CONFIG, dbus) {
331+ SUBDIRS += btclient
332+ }
333 }
334
335 symbian {
336--
3371.7.1
338
diff --git a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
index 5758e1e346..56631bb05c 100644
--- a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
+++ b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
@@ -22,6 +22,7 @@ SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/qt-mobility/qt-mobility-opens
22 file://qt-mobility-no-xvideo.patch \ 22 file://qt-mobility-no-xvideo.patch \
23 file://fix_metaobjectbuilder_build_err.patch \ 23 file://fix_metaobjectbuilder_build_err.patch \
24 file://0001-fix-embedded-usage-doesn-t-work-outside-of-Qt.patch \ 24 file://0001-fix-embedded-usage-doesn-t-work-outside-of-Qt.patch \
25 file://fix-compile-error-no-bluez.patch \
25 " 26 "
26 27
27SRC_URI[md5sum]="ea5db5a8d3dd4709c2926dceda646bd8" 28SRC_URI[md5sum]="ea5db5a8d3dd4709c2926dceda646bd8"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-06 21:40:37 +0000