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/lib/shared/qtresourceview.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/lib/shared/qtresourceview.cpp')
| -rw-r--r-- | src/designer/src/lib/shared/qtresourceview.cpp | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/designer/src/lib/shared/qtresourceview.cpp b/src/designer/src/lib/shared/qtresourceview.cpp index 61f00a53d..292329e2e 100644 --- a/src/designer/src/lib/shared/qtresourceview.cpp +++ b/src/designer/src/lib/shared/qtresourceview.cpp @@ -35,28 +35,30 @@ #include <QtDesigner/abstractsettings.h> #include <QtWidgets/qtoolbar.h> -#include <QtWidgets/qaction.h> #include <QtWidgets/qsplitter.h> #include <QtWidgets/qtreewidget.h> #include <QtWidgets/qlistwidget.h> #include <QtWidgets/qheaderview.h> #include <QtWidgets/qboxlayout.h> -#include <QtGui/qpainter.h> -#include <QtCore/qfileinfo.h> -#include <QtCore/qdir.h> -#include <QtCore/qqueue.h> -#include <QtGui/qpainter.h> #include <QtWidgets/qdialogbuttonbox.h> #include <QtWidgets/qpushbutton.h> #include <QtWidgets/qmessagebox.h> #include <QtWidgets/qapplication.h> -#if QT_CONFIG(clipboard) -#include <QtGui/qclipboard.h> -#endif #include <QtWidgets/qmenu.h> #include <QtWidgets/qlineedit.h> + +#include <QtGui/qaction.h> +#if QT_CONFIG(clipboard) +# include <QtGui/qclipboard.h> +#endif #include <QtGui/qdrag.h> +#include <QtGui/qpainter.h> + #include <QtCore/qmimedata.h> +#include <QtCore/qfileinfo.h> +#include <QtCore/qdir.h> +#include <QtCore/qqueue.h> + #include <QtXml/qdom.h> #include <algorithm> |