diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-04 16:12:42 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-04 16:12:42 +0200 |
| commit | 2a5b89572f864f047b7addcc4e79e69b58fa375d (patch) | |
| tree | 760afc25f0ab56d36219f4f924b5bafc162b6338 /src | |
| parent | 27de80121d96d1bcb44f58a28c0fd6e9ad620a26 (diff) | |
| parent | 71408b68436445d2d4c556603e33a17db68ea680 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
.qmake.conf
Change-Id: I1ef4c216c90e89e48e56936d81b5229e86f63508
Diffstat (limited to 'src')
| -rw-r--r-- | src/activeqt/control/qaxfactory.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/activeqt/control/qaxfactory.h b/src/activeqt/control/qaxfactory.h index 9beacbf..0ba62b0 100644 --- a/src/activeqt/control/qaxfactory.h +++ b/src/activeqt/control/qaxfactory.h @@ -55,6 +55,7 @@ QT_WARNING_PUSH QT_WARNING_DISABLE_GCC("-Woverloaded-virtual") // gcc complains about QObject::metaObject() being hidden. +QT_WARNING_DISABLE_CLANG("-Woverloaded-virtual") // clang-cl complains about QObject::metaObject() being hidden. #include <QtCore/qhash.h> #include <QtCore/quuid.h> |