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/qdesigner_promotiondialog.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/qdesigner_promotiondialog.cpp')
| -rw-r--r-- | src/designer/src/lib/shared/qdesigner_promotiondialog.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/designer/src/lib/shared/qdesigner_promotiondialog.cpp b/src/designer/src/lib/shared/qdesigner_promotiondialog.cpp index e2dd81509..186410fd0 100644 --- a/src/designer/src/lib/shared/qdesigner_promotiondialog.cpp +++ b/src/designer/src/lib/shared/qdesigner_promotiondialog.cpp @@ -39,22 +39,24 @@ #include <QtDesigner/abstractintegration.h> #include <abstractdialoggui_p.h> -#include <QtCore/qtimer.h> #include <QtWidgets/qboxlayout.h> #include <QtWidgets/qformlayout.h> #include <QtWidgets/qdialogbuttonbox.h> #include <QtWidgets/qtreeview.h> #include <QtWidgets/qheaderview.h> #include <QtWidgets/qpushbutton.h> -#include <QtCore/qitemselectionmodel.h> #include <QtWidgets/qcombobox.h> #include <QtWidgets/qlineedit.h> #include <QtWidgets/qcheckbox.h> -#include <QtGui/qvalidator.h> #include <QtWidgets/qlabel.h> #include <QtWidgets/qlayoutitem.h> #include <QtWidgets/qmenu.h> -#include <QtWidgets/qaction.h> + +#include <QtGui/qaction.h> +#include <QtGui/qvalidator.h> + +#include <QtCore/qitemselectionmodel.h> +#include <QtCore/qtimer.h> QT_BEGIN_NAMESPACE |