diff options
author | Liang Qi <liang.qi@qt.io> | 2017-11-20 13:18:20 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-11-20 14:37:20 +0100 |
commit | a2edd6add546b0596e5908291d3e0153ff487f08 (patch) | |
tree | f599afdbe38157c844212c36a1690ff903df4fd2 /src/shared | |
parent | b7a6bbf420d1eed9daefd232dc48933e7d6f7c4e (diff) | |
parent | 6491ca02253f3245333611cabf248ef01bd31883 (diff) |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/qdoc/qdocdatabase.h
Change-Id: I044c17d6a953c9689a4d928972d3fd757e468114
Diffstat (limited to 'src/shared')
-rw-r--r-- | src/shared/qtgradienteditor/qtcolorline.h | 2 | ||||
-rw-r--r-- | src/shared/qtpropertybrowser/qttreepropertybrowser.cpp | 1 | ||||
-rw-r--r-- | src/shared/qtpropertybrowser/qttreepropertybrowser.h | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/src/shared/qtgradienteditor/qtcolorline.h b/src/shared/qtgradienteditor/qtcolorline.h index 606d0fa84..6d19ed4d9 100644 --- a/src/shared/qtgradienteditor/qtcolorline.h +++ b/src/shared/qtgradienteditor/qtcolorline.h @@ -54,7 +54,6 @@ class QtColorLine : public QWidget Q_PROPERTY(bool backgroundCheckered READ isBackgroundCheckered WRITE setBackgroundCheckered) Q_PROPERTY(ColorComponent colorComponent READ colorComponent WRITE setColorComponent) Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrientation) - Q_ENUMS(ColorComponent) public: enum ColorComponent { @@ -66,6 +65,7 @@ public: Value, Alpha }; + Q_ENUM(ColorComponent) QSize minimumSizeHint() const; QSize sizeHint() const; diff --git a/src/shared/qtpropertybrowser/qttreepropertybrowser.cpp b/src/shared/qtpropertybrowser/qttreepropertybrowser.cpp index 6c1338c77..9bc5e4f21 100644 --- a/src/shared/qtpropertybrowser/qttreepropertybrowser.cpp +++ b/src/shared/qtpropertybrowser/qttreepropertybrowser.cpp @@ -402,7 +402,6 @@ static QIcon drawIndicatorIcon(const QPalette &palette, QStyle *style) QPixmap pix(14, 14); pix.fill(Qt::transparent); QStyleOption branchOption; - QRect r(QPoint(0, 0), pix.size()); branchOption.rect = QRect(2, 2, 9, 9); // ### hardcoded in qcommonstyle.cpp branchOption.palette = palette; branchOption.state = QStyle::State_Children; diff --git a/src/shared/qtpropertybrowser/qttreepropertybrowser.h b/src/shared/qtpropertybrowser/qttreepropertybrowser.h index a2ea777f6..9ff4d5f50 100644 --- a/src/shared/qtpropertybrowser/qttreepropertybrowser.h +++ b/src/shared/qtpropertybrowser/qttreepropertybrowser.h @@ -50,7 +50,6 @@ class QtTreePropertyBrowserPrivate; class QtTreePropertyBrowser : public QtAbstractPropertyBrowser { Q_OBJECT - Q_ENUMS(ResizeMode) Q_PROPERTY(int indentation READ indentation WRITE setIndentation) Q_PROPERTY(bool rootIsDecorated READ rootIsDecorated WRITE setRootIsDecorated) Q_PROPERTY(bool alternatingRowColors READ alternatingRowColors WRITE setAlternatingRowColors) @@ -67,6 +66,7 @@ public: Fixed, ResizeToContents }; + Q_ENUM(ResizeMode) QtTreePropertyBrowser(QWidget *parent = 0); ~QtTreePropertyBrowser(); |