diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:33:29 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:33:53 +0100 |
| commit | 6ddc5720d0bc03f72bd47718a37294ca7c211d86 (patch) | |
| tree | 152385fb592e8f5f9e4161f20293630de9e17e5c /src | |
| parent | a3a8dd0bf97f77368f5f0262b94115875bd0669e (diff) | |
| parent | 50578d3893c611b3a33bbd8239a126f2b8f234b1 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
.qmake.conf
Change-Id: I8f6b5ce962177001d064be5b7b0c4740607e999b
Diffstat (limited to 'src')
| -rw-r--r-- | src/activeqt/control/qaxfactory.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/activeqt/control/qaxfactory.h b/src/activeqt/control/qaxfactory.h index b9cbe24..9beacbf 100644 --- a/src/activeqt/control/qaxfactory.h +++ b/src/activeqt/control/qaxfactory.h @@ -51,6 +51,11 @@ #ifndef QAXFACTORY_H #define QAXFACTORY_H +#include <QtCore/qcompilerdetection.h> + +QT_WARNING_PUSH +QT_WARNING_DISABLE_GCC("-Woverloaded-virtual") // gcc complains about QObject::metaObject() being hidden. + #include <QtCore/qhash.h> #include <QtCore/quuid.h> #include <QtCore/qfactoryinterface.h> @@ -62,8 +67,6 @@ struct IUnknown; struct IDispatch; QT_BEGIN_NAMESPACE -QT_WARNING_PUSH -QT_WARNING_DISABLE_GCC("-Woverloaded-virtual") // gcc complains about QObject::metaObject() being hidden. class QWidget; class QSettings; @@ -331,8 +334,8 @@ private: } \ QT_END_NAMESPACE -QT_WARNING_POP QT_END_NAMESPACE +QT_WARNING_POP #ifndef Q_COM_METATYPE_DECLARED #define Q_COM_METATYPE_DECLARED |