diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-03-29 18:40:46 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-03-31 09:23:49 +0200 |
| commit | aba0fda9c8b81e05794fac44fdbe54406137e597 (patch) | |
| tree | 2058d079553f2e83b2a03b9102081771a1312d97 /src/designer/src/plugins | |
| parent | a72b17aac59e99089ba5f0169f577c83fb48fd5d (diff) | |
Update dependencies
Adapt to
qtbase/bcaff2b06fc46fce8a3ae6d613c025c8d097229c merging the
QAction classes, qtbase/d975ad4ed728553b765c61f38c1e0df899187cf5
merging the QShortcut classes and
qtbase/d975ad4ed728553b765c61f38c1e0df899187cf5 moving the Undo
framework to QtGui.
Clean up include directives.
Change-Id: Ib825f17284390c103d5ac2ae1f2c8fe65a534f1a
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/designer/src/plugins')
| -rw-r--r-- | src/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp | 13 | ||||
| -rw-r--r-- | src/designer/src/plugins/tools/view3d/view3d_plugin.cpp | 8 | ||||
| -rw-r--r-- | src/designer/src/plugins/tools/view3d/view3d_tool.cpp | 3 |
3 files changed, 15 insertions, 9 deletions
diff --git a/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp b/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp index bcf792771..2f863781b 100644 --- a/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp +++ b/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp @@ -35,15 +35,18 @@ #include <QtDesigner/abstractformeditor.h> #include <QtDesigner/qextensionmanager.h> +#include <ActiveQt/qaxselect.h> +#include <ActiveQt/qaxtypes.h> + #include <QtWidgets/qmessagebox.h> -#include <QtWidgets/qundostack.h> -#include <QtWidgets/qaction.h> +#include <QtGui/qundostack.h> + +#include <QtGui/qaction.h> + +#include <QtCore/qt_windows.h> #include <QtCore/quuid.h> -#include <ActiveQt/qaxselect.h> -#include <qt_windows.h> #include <olectl.h> -#include <qaxtypes.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/plugins/tools/view3d/view3d_plugin.cpp b/src/designer/src/plugins/tools/view3d/view3d_plugin.cpp index 5af4cc007..3bf356e56 100644 --- a/src/designer/src/plugins/tools/view3d/view3d_plugin.cpp +++ b/src/designer/src/plugins/tools/view3d/view3d_plugin.cpp @@ -29,12 +29,14 @@ #include "view3d_plugin.h" #include "view3d_tool.h" -#include <QtCore/qdebug.h> -#include <QtCore/qtplugin.h> -#include <QtWidgets/qaction.h> #include <QtDesigner/qdesignerformeditorinterface.h> #include <QtDesigner/qdesignerformwindowmanagerinterface.h> +#include <QtGui/qaction.h> + +#include <QtCore/qdebug.h> +#include <QtCore/qtplugin.h> + QView3DPlugin::QView3DPlugin() { m_core = 0; diff --git a/src/designer/src/plugins/tools/view3d/view3d_tool.cpp b/src/designer/src/plugins/tools/view3d/view3d_tool.cpp index d53e71943..fe52d6aed 100644 --- a/src/designer/src/plugins/tools/view3d/view3d_tool.cpp +++ b/src/designer/src/plugins/tools/view3d/view3d_tool.cpp @@ -28,9 +28,10 @@ #include "view3d_tool.h" -#include <QtWidgets/qaction.h> #include <QtDesigner/qdesignerformwindowinterface.h> +#include <QtGui/qaction.h> + QView3DTool::QView3DTool(QDesignerFormWindowInterface *formWindow, QObject *parent) : QDesignerFormWindowToolInterface(parent) { |