diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-20 03:01:54 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-20 03:01:54 +0200 |
| commit | 2144c9bb23e672ad76170ba605d8155dda0509cd (patch) | |
| tree | d90e62858361f137bbeca52c2a825f3a160b6b0a | |
| parent | 3d3ec897712f590e9e4e5ffad4b7017e235295cb (diff) | |
| parent | 54e8925e0997bb4606e4b5491d2d8e446db401ce (diff) | |
| download | qttools-2144c9bb23e672ad76170ba605d8155dda0509cd.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: Iaa139d63fdca442ce2bcf439dc7b7774eda9a5f5
| -rw-r--r-- | src/designer/src/designer/qdesigner.h | 2 | ||||
| -rw-r--r-- | src/designer/src/plugins/qwebview/qwebview_plugin.cpp | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/designer/src/designer/qdesigner.h b/src/designer/src/designer/qdesigner.h index 258e1e5ff..7d58db26b 100644 --- a/src/designer/src/designer/qdesigner.h +++ b/src/designer/src/designer/qdesigner.h @@ -67,7 +67,7 @@ public: void setMainWindow(MainWindowBase *tw); protected: - bool event(QEvent *ev); + bool event(QEvent *ev) override; signals: void initialized(); diff --git a/src/designer/src/plugins/qwebview/qwebview_plugin.cpp b/src/designer/src/plugins/qwebview/qwebview_plugin.cpp index ac4dcf673..c91c77327 100644 --- a/src/designer/src/plugins/qwebview/qwebview_plugin.cpp +++ b/src/designer/src/plugins/qwebview/qwebview_plugin.cpp @@ -28,9 +28,6 @@ #include "qwebview_plugin.h" -#include <QtDesigner/qextensionfactory.h> -#include <QtDesigner/qextensionmanager.h> - #include <QtCore/qplugin.h> #include <QWebView> |