diff options
| author | Christian Stenger <christian.stenger@qt.io> | 2019-09-02 07:36:29 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2019-09-02 05:48:38 +0000 |
| commit | 330126af1e69190628c7c4e90b2386fc82db7fcb (patch) | |
| tree | 833c0ea52d6b632b9783cf5c2e34e0dd0c0c8534 | |
| parent | fa5af00db6056985d7f6ec27f4be2e4291508f41 (diff) | |
| download | qt-creator-330126af1e69190628c7c4e90b2386fc82db7fcb.tar.gz | |
QmlDesigner: Fix includes and compile on Linux
Change-Id: If1cf1d6a2f7c9ec25d7e2bd949f4f4cd6295b694
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
3 files changed, 1 insertions, 2 deletions
diff --git a/src/plugins/qmldesigner/components/propertyeditor/simplecolorpalettemodel.cpp b/src/plugins/qmldesigner/components/propertyeditor/simplecolorpalettemodel.cpp index a3bd38e514..a67a2fc91f 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/simplecolorpalettemodel.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/simplecolorpalettemodel.cpp @@ -37,7 +37,6 @@ #include <QDebug> #include <QSettings> #include <QTimer> -#include <QColor> namespace QmlDesigner { diff --git a/src/plugins/qmldesigner/components/propertyeditor/simplecolorpalettemodel.h b/src/plugins/qmldesigner/components/propertyeditor/simplecolorpalettemodel.h index f487859d07..c1babf263e 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/simplecolorpalettemodel.h +++ b/src/plugins/qmldesigner/components/propertyeditor/simplecolorpalettemodel.h @@ -28,6 +28,7 @@ #include <QAbstractListModel> #include <QtQml/qqml.h> #include <QList> +#include <QColor> namespace QmlDesigner { diff --git a/src/plugins/qmldesigner/components/propertyeditor/simplecolorpalettesingleton.h b/src/plugins/qmldesigner/components/propertyeditor/simplecolorpalettesingleton.h index 77ad2b0732..8a2019a1d7 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/simplecolorpalettesingleton.h +++ b/src/plugins/qmldesigner/components/propertyeditor/simplecolorpalettesingleton.h @@ -29,7 +29,6 @@ #include <QAbstractListModel> #include <QtQml/qqml.h> #include <QList> -#include <QColor> #include <simplecolorpalette.h> namespace QmlDesigner { |