diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-18 17:58:50 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-18 21:19:44 +0100 |
| commit | 50578d3893c611b3a33bbd8239a126f2b8f234b1 (patch) | |
| tree | 16e344775d7b25f22b38c20c42d68e9d52817782 | |
| parent | 851309bd2987b451354780e36112c02d5473482d (diff) | |
| parent | 15c9ffc20f205e32b9297249be944bcbedd84fc7 (diff) | |
| download | qtactiveqt-5.10.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.105.10
Conflicts:
.qmake.conf
Change-Id: Ibeb74b560f39f3b6b48344873c87aba3a4af8a2c
| -rw-r--r-- | dist/changes-5.9.4 | 24 | ||||
| -rw-r--r-- | src/activeqt/control/qaxfactory.h | 9 |
2 files changed, 30 insertions, 3 deletions
diff --git a/dist/changes-5.9.4 b/dist/changes-5.9.4 new file mode 100644 index 0000000..bbfe8a2 --- /dev/null +++ b/dist/changes-5.9.4 @@ -0,0 +1,24 @@ +Qt 5.9.4 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.9.0. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +http://doc.qt.io/qt-5/index.html + +The Qt version 5.9 series is binary compatible with the 5.8.x series. +Applications compiled for 5.8 will continue to run with 5.9. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* Qt 5.9.4 Changes * +**************************************************************************** + + - This release contains only minor code improvements. diff --git a/src/activeqt/control/qaxfactory.h b/src/activeqt/control/qaxfactory.h index 770aa02..e2c327b 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 |