Commit 51cd3b80 authored by Friedemann Kleint's avatar Friedemann Kleint
Browse files

Disable gcc warnings by adding pragmas and re-enable headersclean.


- IAxServerBase inherits IUnknown which does not have a virtual destructor.
- QAxFactory::metaObject(const QString &) hides QObject::metaObject()
  (false positive).

Task-number: QTBUG-45666
Change-Id: I8d1e69903ba6edde84ae9d4b64ee2e6088efad8b
Reviewed-by: default avatarAndy Shaw <andy.shaw@digia.com>
Showing with 6 additions and 2 deletions
...@@ -18,8 +18,6 @@ SOURCES = \ ...@@ -18,8 +18,6 @@ SOURCES = \
shared/qaxtypefunctions.cpp \ shared/qaxtypefunctions.cpp \
shared/qaxutils.cpp shared/qaxutils.cpp
mingw: HEADERSCLEAN_EXCLUDE += shared/qaxtypefunctions.h shared/qaxtypes.h control/qaxfactory.h
MODULE = axbase MODULE = axbase
load(qt_module) load(qt_module)
QMAKE_DOCS_TARGETDIR = # Make qt_docs.prf default to activeqt instead of qtaxbase QMAKE_DOCS_TARGETDIR = # Make qt_docs.prf default to activeqt instead of qtaxbase
...@@ -51,6 +51,8 @@ struct IUnknown; ...@@ -51,6 +51,8 @@ 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;
...@@ -288,6 +290,7 @@ public: ...@@ -288,6 +290,7 @@ public:
} \ } \
QT_END_NAMESPACE QT_END_NAMESPACE
QT_WARNING_POP
QT_END_NAMESPACE QT_END_NAMESPACE
#ifndef Q_COM_METATYPE_DECLARED #ifndef Q_COM_METATYPE_DECLARED
......
...@@ -48,6 +48,8 @@ ...@@ -48,6 +48,8 @@
#include <QtCore/qvariant.h> #include <QtCore/qvariant.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_WARNING_PUSH
QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor") // gcc complains about IAxServerBase inheriting IUnknown with non virtual destructor.
extern GUID IID_IAxServerBase; extern GUID IID_IAxServerBase;
struct IAxServerBase : public IUnknown struct IAxServerBase : public IUnknown
...@@ -81,6 +83,7 @@ extern void clearVARIANT(VARIANT *var); ...@@ -81,6 +83,7 @@ extern void clearVARIANT(VARIANT *var);
#define QAX_INPROC_SERVER (0x51540001) #define QAX_INPROC_SERVER (0x51540001)
#define QAX_OUTPROC_SERVER (0x51540002) #define QAX_OUTPROC_SERVER (0x51540002)
QT_WARNING_POP
QT_END_NAMESPACE QT_END_NAMESPACE
#endif // QAXTYPEFUNCTIONS_P_H #endif // QAXTYPEFUNCTIONS_P_H
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