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/lib/shared/qdesigner_promotiondialog.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/lib/shared/qdesigner_promotiondialog.cpp')
| -rw-r--r-- | src/designer/src/lib/shared/qdesigner_promotiondialog.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/designer/src/lib/shared/qdesigner_promotiondialog.cpp b/src/designer/src/lib/shared/qdesigner_promotiondialog.cpp index 716f6491b..a79022a14 100644 --- a/src/designer/src/lib/shared/qdesigner_promotiondialog.cpp +++ b/src/designer/src/lib/shared/qdesigner_promotiondialog.cpp @@ -53,23 +53,23 @@ #include <abstractdialoggui_p.h> #include <QtCore/QTimer> -#include <QtGui/QVBoxLayout> -#include <QtGui/QHBoxLayout> -#include <QtGui/QFormLayout> -#include <QtGui/QDialogButtonBox> -#include <QtGui/QTreeView> -#include <QtGui/QHeaderView> -#include <QtGui/QPushButton> -#include <QtGui/QItemSelectionModel> -#include <QtGui/QItemSelection> -#include <QtGui/QComboBox> -#include <QtGui/QLineEdit> -#include <QtGui/QCheckBox> +#include <QtWidgets/QVBoxLayout> +#include <QtWidgets/QHBoxLayout> +#include <QtWidgets/QFormLayout> +#include <QtWidgets/QDialogButtonBox> +#include <QtWidgets/QTreeView> +#include <QtWidgets/QHeaderView> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QItemSelectionModel> +#include <QtWidgets/QItemSelection> +#include <QtWidgets/QComboBox> +#include <QtWidgets/QLineEdit> +#include <QtWidgets/QCheckBox> #include <QtGui/QRegExpValidator> -#include <QtGui/QLabel> -#include <QtGui/QSpacerItem> -#include <QtGui/QMenu> -#include <QtGui/QAction> +#include <QtWidgets/QLabel> +#include <QtWidgets/QSpacerItem> +#include <QtWidgets/QMenu> +#include <QtWidgets/QAction> QT_BEGIN_NAMESPACE |