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

QmlDesigner: Add list of known global enum scopes

Browse Source 
We know that TextInput and TextEdit are enum scopes. Currently
there is no other way (than hardcoding) to identify those scopes, if
they are used for controls (And the actual type is int).

Change-Id: I8eccc54d3b7a90428a71c882364a04e5d1030988
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Thomas Hartmann
2015-07-08 14:35:09 +02:00
committed by Thomas Hartmann
parent dd32d1a16e
commit 2221257306
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
View File

@@ -82,6 +82,12 @@ static inline QStringList globalQtEnums()
return list; return list;
} }
static inline QStringList knownEnumScopes()
{
static QStringList list = QStringList() << QStringLiteral("TextInput") << QStringLiteral("TextEdit");
return list;
}
static inline bool supportedQtQuickVersion(const QString &version) static inline bool supportedQtQuickVersion(const QString &version)
{ {
static QStringList supportedVersions = supportedVersionsList(); static QStringList supportedVersions = supportedVersionsList();
@@ -574,11 +580,17 @@ public:
{ {
QStringList astValueList = astValue.split(QStringLiteral(".")); QStringList astValueList = astValue.split(QStringLiteral("."));
if (astValueList.count() == 2 //Check for global Qt enums if (astValueList.count() == 2) {
&& astValueList.first() == QStringLiteral("Qt") //Check for global Qt enums
if (astValueList.first() == QStringLiteral("Qt")
&& globalQtEnums().contains(astValueList.last())) && globalQtEnums().contains(astValueList.last()))
return QVariant::fromValue(Enumeration(astValue)); return QVariant::fromValue(Enumeration(astValue));
//Check for known enum scopes used globally
if (knownEnumScopes().contains(astValueList.first()))
return QVariant::fromValue(Enumeration(astValue));
}
AST::ExpressionStatement *eStmt = AST::cast<AST::ExpressionStatement *>(rhs); AST::ExpressionStatement *eStmt = AST::cast<AST::ExpressionStatement *>(rhs);
if (!eStmt || !eStmt->expression) if (!eStmt || !eStmt->expression)
return QVariant(); return QVariant();