diff options
| author | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-04-17 13:41:01 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-04-17 18:10:54 +0000 |
| commit | 593581b05a511406ff27fb56996bfddc2ac9720d (patch) | |
| tree | c46f978219f1288b0b76b86223299f679c63a056 | |
| parent | b4c95d88c9aa8dc520793207c4bc344927690f47 (diff) | |
MinGW: Fix build with headerclean check
qaxtypefunctions.h uses IUnknown as base class, which
causes warnings on MinGW due to not having a virtual
destructor:
qaxtypefunctions.h:57:8: error: base class 'struct IUnknown' has accessible non-virtual destructor [-Werror=non-virtual-dtor]
struct IAxServerBase : public IUnknown
QAxFactory hides the declaration of metaObject() in QObject:
qobjectdefs.h:158:32: error: 'virtual const QMetaObject* QObject::metaObject() const' was hidden [-Werror=overloaded-virtual]
virtual const QMetaObject *metaObject() const; \
^
qaxfactory.h:68:32: error: by 'virtual const QMetaObject*
QAxFactory::metaObject(const QString&) const' [-Werror=overloaded-virtual]
virtual const QMetaObject *metaObject(const QString &key) const = 0;
^
Task-number: QTBUG-45666
Change-Id: I9cdf275a1c74950d66c19e025918b8416f94d9ca
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| -rw-r--r-- | src/activeqt/axshared.prx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/activeqt/axshared.prx b/src/activeqt/axshared.prx index 6d335e9..2964354 100644 --- a/src/activeqt/axshared.prx +++ b/src/activeqt/axshared.prx @@ -18,6 +18,8 @@ SOURCES = \ shared/qaxtypefunctions.cpp \ shared/qaxutils.cpp +mingw: HEADERSCLEAN_EXCLUDE += shared/qaxtypefunctions.h shared/qaxtypes.h control/qaxfactory.h + MODULE = axbase load(qt_module) QMAKE_DOCS_TARGETDIR = # Make qt_docs.prf default to activeqt instead of qtaxbase |