b60dcae74a
- since we no longer have GCC3_ARCHES, simplify, no way it's gonna compile on a GCC2_ARCH anyways (size matters) - so, we have only SHARED_ONLY arches, remove those frags as well. - fold back qt4-sqlite since sqlite is part of core now.
17 lines
721 B
Plaintext
17 lines
721 B
Plaintext
$OpenBSD: patch-src_dbus_qdbusintegrator_cpp,v 1.2 2012/06/14 09:38:35 espie Exp $
|
|
|
|
Fixes an invalid conversion error on sparc64.
|
|
http://bugreports.qt.nokia.com/browse/QTBUG-17962
|
|
|
|
--- src/dbus/qdbusintegrator.cpp.orig Thu Dec 8 06:06:03 2011
|
|
+++ src/dbus/qdbusintegrator.cpp Thu Dec 15 20:11:04 2011
|
|
@@ -72,7 +72,7 @@ QT_BEGIN_NAMESPACE
|
|
static bool isDebugging;
|
|
#define qDBusDebug if (!::isDebugging); else qDebug
|
|
|
|
-Q_GLOBAL_STATIC_WITH_ARGS(const QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS)))
|
|
+Q_GLOBAL_STATIC_WITH_ARGS(QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS)))
|
|
|
|
static inline QString dbusServiceString()
|
|
{ return *orgFreedesktopDBusString(); }
|