feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Fix compile for Qt5.13

Browse Source 
Change-Id: I963997432e643d7e7ca5d4ddc2419534191d3c36
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Henning Gruendl
2020-02-26 11:30:32 +01:00
committed by Henning Gründl
parent 2cd44a546f
commit 3749979ba8
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmldesigner/components/propertyeditor/gradientpresetdefaultlistmodel.cpp
View File

@@ -57,7 +57,7 @@ void GradientPresetDefaultListModel::addAllPresets()
for (int i = 0; i < metaEnum.keyCount(); i++) {
auto preset = GradientPresetItem::Preset(metaEnum.value(i));
if (preset < GradientPresetItem::Preset::NumPresets)
if (preset < GradientPresetItem::numPresets)
addItem(GradientPresetItem(preset));
}
}

8
src/plugins/qmldesigner/components/propertyeditor/gradientpresetitem.h
View File

@@ -42,7 +42,13 @@ public:
#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)
using Preset = QGradient::Preset;
#else
enum Preset { NumPresets = 0 };
enum Preset {};
#endif
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
static const int numPresets = Preset::NumPresets;
#else
static const int numPresets = 181;
#endif
explicit GradientPresetItem();