AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QtDBus: Raise minimum supported MSVC version to 2015

Browse Source 
Remove code for older versions and streamline #ifdefs.

Task-number: QTBUG-51673
Change-Id: I0c0ba4e914a1f3b7a324c68c59544a5074f7b075
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Friedemann Kleint 2018-01-04 14:29:52 +01:00
parent 98a3502fa5
commit 3439f523b8
2 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/dbus/qdbusabstractadaptor_p.h
View File

@ -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;

8
src/dbus/qdbusconnection_p.h
View File

@ -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(); }