diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-03-08 18:49:51 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-14 20:00:00 +0100 |
| commit | ded80cfc8a3f258a85954b4fd19063f9988f3744 (patch) | |
| tree | 457b34880bcc25fdd5c9c3157f8b3020cb27994b /src/dbus/qdbusutil.cpp | |
| parent | b05139b2dc1f52690fb30f0734ef38716a87303d (diff) | |
Make some DBus classes bootstrapping-ready.
Change-Id: Ib7611fb0bf8e226a36064a100280e1ab7a0e159d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/dbus/qdbusutil.cpp')
| -rw-r--r-- | src/dbus/qdbusutil.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/dbus/qdbusutil.cpp b/src/dbus/qdbusutil.cpp index bed07692b8..00141bb1cc 100644 --- a/src/dbus/qdbusutil.cpp +++ b/src/dbus/qdbusutil.cpp @@ -76,6 +76,7 @@ static inline bool isValidNumber(QChar c) return (u >= '0' && u <= '9'); } +#ifndef QT_BOOTSTRAPPED static bool argToString(const QDBusArgument &arg, QString &out); static bool variantToString(const QVariant &arg, QString &out) @@ -237,6 +238,7 @@ bool argToString(const QDBusArgument &busArg, QString &out) return true; } +#endif //------- D-Bus Types -------- static const char oneLetterTypes[] = "vsogybnqiuxtdh"; @@ -319,7 +321,11 @@ namespace QDBusUtil { QString out; +#ifndef QT_BOOTSTRAPPED variantToString(arg, out); +#else + Q_UNUSED(arg); +#endif return out; } |