diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-09-16 13:49:26 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-09-16 14:52:40 +0200 |
| commit | 8c6755aeec312ae771ef334fc863642514db3f7c (patch) | |
| tree | 3ccec405ee35690bdb7def6c0a3c42866bd9adc2 /src/dbus/qdbusabstractadaptor_p.h | |
| parent | 104debb6627d71f5540bb2c3347ce56dddc63594 (diff) | |
| parent | c40a48af997f57caa0ecfca0b247837ba5b2f89b (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/corelib/tools/qstring.cpp
Change-Id: Ifc6cd3a0f1cf14cc0fe6cf30afb0c7f40cfdbc3e
Diffstat (limited to 'src/dbus/qdbusabstractadaptor_p.h')
| -rw-r--r-- | src/dbus/qdbusabstractadaptor_p.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/dbus/qdbusabstractadaptor_p.h b/src/dbus/qdbusabstractadaptor_p.h index 3dc8cd320e..284b0fb706 100644 --- a/src/dbus/qdbusabstractadaptor_p.h +++ b/src/dbus/qdbusabstractadaptor_p.h @@ -104,6 +104,10 @@ public: // typedefs { return QLatin1String(interface) < other; } inline bool operator<(const QByteArray &other) const { return interface < other; } +#if defined(Q_CC_MSVC) && _MSC_VER < 1600 + friend inline bool operator<(const QString &str, const AdaptorData &obj) + { return str < QLatin1String(obj.interface); } +#endif }; typedef QVector<AdaptorData> AdaptorMap; |