diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2011-09-13 20:57:01 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2011-09-13 20:57:01 +0200 |
| commit | 7f9aac1d910101267c95a75985a71719682e4ad6 (patch) | |
| tree | ab50a2d005bc0921f68dbce36416848a437c3c0d /src/designer/src/designer/qdesigner_workbench.cpp | |
| parent | 4b2d6747b51137fd2fbff83c0232d155552d6332 (diff) | |
| parent | 650dc4fc2856339805a80e3170f4de6ce1003588 (diff) | |
Merge remote-tracking branch 'origin/refactor' into master
Conflicts:
src/assistant/help/help.pro
src/designer/src/components/formeditor/formwindow.cpp
src/designer/src/components/formeditor/formwindow_dnditem.cpp
src/designer/src/components/formeditor/layout_propertysheet.cpp
src/designer/src/components/formeditor/qdesigner_resource.cpp
src/designer/src/components/lib/lib.pro
src/designer/src/components/signalsloteditor/signalsloteditor.cpp
src/designer/src/components/signalsloteditor/signalsloteditor_tool.cpp
src/designer/src/components/widgetbox/widgetbox_dnditem.cpp
src/designer/src/components/widgetbox/widgetboxtreewidget.cpp
src/designer/src/lib/lib.pro
src/designer/src/lib/shared/qdesigner_formbuilder.cpp
src/designer/src/lib/shared/qdesigner_propertysheet.cpp
src/designer/src/lib/shared/shared.pri
src/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro
src/linguist/lupdate/qdeclarative.cpp
src/linguist/shared/profileevaluator.cpp
src/linguist/shared/qph.cpp
src/linguist/shared/ts.cpp
src/qtconfig/mainwindow.cpp
src/shared/qtgradienteditor/qtcolorline.cpp
src/shared/qtgradienteditor/qtgradientwidget.cpp
sync.profile
Change-Id: I53f0ce4efae4179257cbf3aab87e1af12c3aa4ff
Diffstat (limited to 'src/designer/src/designer/qdesigner_workbench.cpp')
| -rw-r--r-- | src/designer/src/designer/qdesigner_workbench.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/designer/src/designer/qdesigner_workbench.cpp b/src/designer/src/designer/qdesigner_workbench.cpp index 627148b0b..08ad0ee6d 100644 --- a/src/designer/src/designer/qdesigner_workbench.cpp +++ b/src/designer/src/designer/qdesigner_workbench.cpp @@ -68,18 +68,18 @@ #include <QtCore/QPluginLoader> #include <QtCore/qdebug.h> -#include <QtGui/QActionGroup> +#include <QtWidgets/QActionGroup> #include <QtGui/QCloseEvent> -#include <QtGui/QDesktopWidget> -#include <QtGui/QDockWidget> -#include <QtGui/QMenu> -#include <QtGui/QMenuBar> -#include <QtGui/QMessageBox> -#include <QtGui/QPushButton> -#include <QtGui/QToolBar> -#include <QtGui/QMdiArea> -#include <QtGui/QMdiSubWindow> -#include <QtGui/QLayout> +#include <QtWidgets/QDesktopWidget> +#include <QtWidgets/QDockWidget> +#include <QtWidgets/QMenu> +#include <QtWidgets/QMenuBar> +#include <QtWidgets/QMessageBox> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QToolBar> +#include <QtWidgets/QMdiArea> +#include <QtWidgets/QMdiSubWindow> +#include <QtWidgets/QLayout> QT_BEGIN_NAMESPACE |