From 451ca492ea5f71045597f26db54c840addb6d6ae Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 12 Dec 2017 09:53:18 +0100 Subject: Bump version Change-Id: I258176199edd6a6cd413830bfeb0eac070bd5a89 --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index 2108ac6..4f571fb 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.9.3 +MODULE_VERSION = 5.9.4 -- cgit v1.2.1 From 9647c0b54f1aa0ffdf3a6d23a80a0802c6f3e343 Mon Sep 17 00:00:00 2001 From: Antti Kokko Date: Thu, 4 Jan 2018 11:55:35 +0200 Subject: Add changes file for Qt 5.9.4 Change-Id: Iead5f79b489e14cf654fcafbcc171557c9f6e8e5 Reviewed-by: Friedemann Kleint --- dist/changes-5.9.4 | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 dist/changes-5.9.4 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. -- cgit v1.2.1 From 15c9ffc20f205e32b9297249be944bcbedd84fc7 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Wed, 10 Jan 2018 17:09:12 +0100 Subject: Fix compilation with newer gcc Move disabling of overloaded-virtual warning before the includes, and the Q_OBJECT definition, to make it effective. Task-number: QTBUG-65676 Change-Id: Ic34e5ade0b21b53540db9b2f429f1b441463632c Reviewed-by: Friedemann Kleint --- src/activeqt/control/qaxfactory.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) 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 + +QT_WARNING_PUSH +QT_WARNING_DISABLE_GCC("-Woverloaded-virtual") // gcc complains about QObject::metaObject() being hidden. + #include #include #include @@ -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 -- cgit v1.2.1