diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-01-04 14:29:52 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-01-04 20:24:09 +0000 |
commit | 3439f523b8f32041105e26304c097f1ae46ef42b (patch) | |
tree | 70bb28285a2aa20f6884c95f50a18ea91d0242ca /src/dbus | |
parent | 98a3502fa585c16a45b558a1ad27266a43338b88 (diff) | |
download | qtbase-3439f523b8f32041105e26304c097f1ae46ef42b.tar.gz |
QtDBus: Raise minimum supported MSVC version to 2015
Remove code for older versions and streamline #ifdefs.
Task-number: QTBUG-51673
Change-Id: I0c0ba4e914a1f3b7a324c68c59544a5074f7b075
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/dbus')
-rw-r--r-- | src/dbus/qdbusabstractadaptor_p.h | 4 | ||||
-rw-r--r-- | src/dbus/qdbusconnection_p.h | 8 |
2 files changed, 0 insertions, 12 deletions
diff --git a/src/dbus/qdbusabstractadaptor_p.h b/src/dbus/qdbusabstractadaptor_p.h index ed28777734..134cc78e57 100644 --- a/src/dbus/qdbusabstractadaptor_p.h +++ b/src/dbus/qdbusabstractadaptor_p.h @@ -102,10 +102,6 @@ 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; diff --git a/src/dbus/qdbusconnection_p.h b/src/dbus/qdbusconnection_p.h index 3043d7378c..444d4727fd 100644 --- a/src/dbus/qdbusconnection_p.h +++ b/src/dbus/qdbusconnection_p.h @@ -148,14 +148,6 @@ public: { return name < other; } inline bool operator<(const QStringRef &other) const { return QStringRef(&name) < other; } -#if defined(Q_CC_MSVC) && _MSC_VER < 1600 - inline bool operator<(const ObjectTreeNode &other) const - { return name < other.name; } - friend inline bool operator<(const QString &str, const ObjectTreeNode &obj) - { return str < obj.name; } - friend inline bool operator<(const QStringRef &str, const ObjectTreeNode &obj) - { return str < QStringRef(&obj.name); } -#endif inline bool isActive() const { return obj || !children.isEmpty(); } |