diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-01-04 16:34:11 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-01-08 17:46:53 +0000 |
| commit | f1e174860fed0d83e6150b041f756c947442e3ad (patch) | |
| tree | 49af9e0a57935face34d9d71a41b9f59220d61ac /src/designer/src/lib | |
| parent | d7bafcaf801cbcf246b4413ef5c91c7665475d7c (diff) | |
| download | qttools-f1e174860fed0d83e6150b041f756c947442e3ad.tar.gz | |
Qt Designer: Raise minimum supported MSVC version to 2015
Remove code for older versions and streamline #ifdefs.
Task-number: QTBUG-51673
Change-Id: I9c1d86c111c112359d7d5ad4ce9cd83f8939806b
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'src/designer/src/lib')
| -rw-r--r-- | src/designer/src/lib/extension/extension.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/src/designer/src/lib/extension/extension.h b/src/designer/src/lib/extension/extension.h index 598a3db6a..291d9125d 100644 --- a/src/designer/src/lib/extension/extension.h +++ b/src/designer/src/lib/extension/extension.h @@ -57,24 +57,6 @@ public: }; Q_DECLARE_INTERFACE(QAbstractExtensionManager, "org.qt-project.Qt.QAbstractExtensionManager") -#if defined(Q_CC_MSVC) && (_MSC_VER < 1300) - -template <class T> -inline T qt_extension_helper(QAbstractExtensionManager *, QObject *, T) -{ return 0; } - -template <class T> -inline T qt_extension(QAbstractExtensionManager* manager, QObject *object) -{ return qt_extension_helper(manager, object, T(0)); } - -#define Q_DECLARE_EXTENSION_INTERFACE(IFace, IId) \ -const char * const IFace##_iid = IId; \ -Q_DECLARE_INTERFACE(IFace, IId) \ -template <> inline IFace *qt_extension_helper<IFace *>(QAbstractExtensionManager *manager, QObject *object, IFace *) \ -{ QObject *extension = manager->extension(object, Q_TYPEID(IFace)); return (IFace *)(extension ? extension->qt_metacast(IFace##_iid) : 0); } - -#else - template <class T> inline T qt_extension(QAbstractExtensionManager *, QObject *) { return Q_NULLPTR; } @@ -85,8 +67,6 @@ Q_DECLARE_INTERFACE(IFace, IId) \ template <> inline IFace *qt_extension<IFace *>(QAbstractExtensionManager *manager, QObject *object) \ { QObject *extension = manager->extension(object, Q_TYPEID(IFace)); return extension ? static_cast<IFace *>(extension->qt_metacast(IFace##_iid)) : static_cast<IFace *>(Q_NULLPTR); } -#endif - QT_END_NAMESPACE #endif // EXTENSION_H |