Commit 15c9ffc2 authored by Kai Koehne's avatar Kai Koehne
Browse files

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: default avatarFriedemann Kleint <Friedemann.Kleint@qt.io>
Showing with 6 additions and 3 deletions
...@@ -51,6 +51,11 @@ ...@@ -51,6 +51,11 @@
#ifndef QAXFACTORY_H #ifndef QAXFACTORY_H
#define 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/qhash.h>
#include <QtCore/quuid.h> #include <QtCore/quuid.h>
#include <QtCore/qfactoryinterface.h> #include <QtCore/qfactoryinterface.h>
...@@ -62,8 +67,6 @@ struct IUnknown; ...@@ -62,8 +67,6 @@ struct IUnknown;
struct IDispatch; struct IDispatch;
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_WARNING_PUSH
QT_WARNING_DISABLE_GCC("-Woverloaded-virtual") // gcc complains about QObject::metaObject() being hidden.
class QWidget; class QWidget;
class QSettings; class QSettings;
...@@ -331,8 +334,8 @@ private: ...@@ -331,8 +334,8 @@ private:
} \ } \
QT_END_NAMESPACE QT_END_NAMESPACE
QT_WARNING_POP
QT_END_NAMESPACE QT_END_NAMESPACE
QT_WARNING_POP
#ifndef Q_COM_METATYPE_DECLARED #ifndef Q_COM_METATYPE_DECLARED
#define Q_COM_METATYPE_DECLARED #define Q_COM_METATYPE_DECLARED
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment