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/designer/qdesigner_workbench.cpp | |
| 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/designer/qdesigner_workbench.cpp')
| -rw-r--r-- | src/designer/src/designer/qdesigner_workbench.cpp | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/designer/src/designer/qdesigner_workbench.cpp b/src/designer/src/designer/qdesigner_workbench.cpp index b3b14d1c0..9af0b3138 100644 --- a/src/designer/src/designer/qdesigner_workbench.cpp +++ b/src/designer/src/designer/qdesigner_workbench.cpp @@ -48,16 +48,6 @@ #include <QtDesigner/private/formwindowbase_p.h> #include <QtDesigner/private/actioneditor_p.h> -#include <QtCore/qdir.h> -#include <QtCore/qfile.h> -#include <QtCore/qurl.h> -#include <QtCore/qtimer.h> -#include <QtCore/qpluginloader.h> -#include <QtCore/qdebug.h> - -#include <QtWidgets/qactiongroup.h> -#include <QtGui/qevent.h> -#include <QtGui/qscreen.h> #include <QtWidgets/qdockwidget.h> #include <QtWidgets/qmenu.h> #include <QtWidgets/qmenubar.h> @@ -68,6 +58,17 @@ #include <QtWidgets/qmdisubwindow.h> #include <QtWidgets/qlayout.h> +#include <QtGui/qactiongroup.h> +#include <QtGui/qevent.h> +#include <QtGui/qscreen.h> + +#include <QtCore/qdir.h> +#include <QtCore/qfile.h> +#include <QtCore/qurl.h> +#include <QtCore/qtimer.h> +#include <QtCore/qpluginloader.h> +#include <QtCore/qdebug.h> + QT_BEGIN_NAMESPACE static const char *appFontPrefixC = "AppFonts"; |