From aba0fda9c8b81e05794fac44fdbe54406137e597 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Sun, 29 Mar 2020 18:40:46 +0200 Subject: 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 --- src/designer/src/designer/qdesigner_workbench.cpp | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'src/designer/src/designer/qdesigner_workbench.cpp') 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 #include -#include -#include -#include -#include -#include -#include - -#include -#include -#include #include #include #include @@ -68,6 +58,17 @@ #include #include +#include +#include +#include + +#include +#include +#include +#include +#include +#include + QT_BEGIN_NAMESPACE static const char *appFontPrefixC = "AppFonts"; -- cgit v1.2.3