diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-11 18:03:49 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-11 18:05:16 +0100 |
| commit | fe2c46d86e4287580191fc71357ec776cf1f5dd8 (patch) | |
| tree | 2d580b6a291206d0de54404e03a06b5c58b07b22 /src/shared | |
| parent | fff948341a61ce592013303ec40e64a1bf27e678 (diff) | |
| parent | 58f0987e16ac4580d9e4a6b604dd7603510b0385 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
.qmake.conf
Change-Id: Ieef1b05234ee67bef28f2dc9abaa65f10840d21b
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/qtgradienteditor/qtgradienteditor.cpp | 2 | ||||
| -rw-r--r-- | src/shared/qtgradienteditor/qtgradientview.cpp | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/shared/qtgradienteditor/qtgradienteditor.cpp b/src/shared/qtgradienteditor/qtgradienteditor.cpp index 25e9fdb2a..57d35b83a 100644 --- a/src/shared/qtgradienteditor/qtgradienteditor.cpp +++ b/src/shared/qtgradienteditor/qtgradienteditor.cpp @@ -41,6 +41,8 @@ #include "qtgradientstopscontroller.h" #include "ui_qtgradienteditor.h" +#include <QtWidgets/QButtonGroup> + QT_BEGIN_NAMESPACE class QtGradientEditorPrivate diff --git a/src/shared/qtgradienteditor/qtgradientview.cpp b/src/shared/qtgradienteditor/qtgradientview.cpp index a0d4790e6..29c33574e 100644 --- a/src/shared/qtgradienteditor/qtgradientview.cpp +++ b/src/shared/qtgradienteditor/qtgradientview.cpp @@ -41,9 +41,10 @@ #include "qtgradientmanager.h" #include "qtgradientdialog.h" #include "qtgradientutils.h" +#include <QtGui/QClipboard> #include <QtGui/QPainter> +#include <QtWidgets/QAction> #include <QtWidgets/QMessageBox> -#include <QtGui/QClipboard> QT_BEGIN_NAMESPACE |