diff options
author | Jonathan Liu <net147@gmail.com> | 2013-07-04 09:50:32 +1000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-07-05 15:44:13 +0100 |
commit | 0463e5c173fed7f081760dea6e8f1bbe4cdbb2e8 (patch) | |
tree | dbf652bc6adf22bc60c0fc5f9d77f21de9f5fa5b /meta/recipes-qt/qt4/qt4-4.8.5/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch | |
parent | 262fa7ee4608c02e41092d3dccaf81463dd4f833 (diff) | |
download | poky-0463e5c173fed7f081760dea6e8f1bbe4cdbb2e8.tar.gz |
qt4: upgrade to 4.8.5
Removed patches integrated upstream.
Added INSANE_SKIP libdir for examples packages as it includes plugin
shared libraries outside of libdir.
(From OE-Core rev: f119566477243ce43b727492dc78b9cb3dd76de4)
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-4.8.5/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch')
-rw-r--r-- | meta/recipes-qt/qt4/qt4-4.8.5/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.5/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch b/meta/recipes-qt/qt4/qt4-4.8.5/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch new file mode 100644 index 0000000000..7d3b336f77 --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-4.8.5/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From 2011bb8029480af1d1266f258e5a5f5cef7392d3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Pavel Heimlich <tropikhajma@gmail.com> | ||
3 | Date: Wed, 26 Sep 2012 20:31:10 +0200 | ||
4 | Subject: [PATCH 07/21] dbus: Remove "const" usage that causes compile failure | ||
5 | building nativesdk-qt4-tools | ||
6 | |||
7 | Patch has apparently been rejected upstream, not because it is invalid | ||
8 | but because the submitter did not submit a merge request for it, so the | ||
9 | validity of the patch upstream is uncertain. For further details see: | ||
10 | http://bugreports.qt.nokia.com/browse/QTBUG-17962 | ||
11 | |||
12 | Upstream-Status: Denied [possible retry] | ||
13 | |||
14 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
15 | --- | ||
16 | src/dbus/qdbusintegrator.cpp | 2 +- | ||
17 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp | ||
20 | index 0f0b647..aa4cbab 100644 | ||
21 | --- a/src/dbus/qdbusintegrator.cpp | ||
22 | +++ b/src/dbus/qdbusintegrator.cpp | ||
23 | @@ -73,7 +73,7 @@ QT_BEGIN_NAMESPACE | ||
24 | static bool isDebugging; | ||
25 | #define qDBusDebug if (!::isDebugging); else qDebug | ||
26 | |||
27 | -Q_GLOBAL_STATIC_WITH_ARGS(const QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS))) | ||
28 | +Q_GLOBAL_STATIC_WITH_ARGS(QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS))) | ||
29 | |||
30 | static inline QString dbusServiceString() | ||
31 | { return *orgFreedesktopDBusString(); } | ||
32 | -- | ||
33 | 1.8.0 | ||
34 | |||