diff --git a/src/libs/qmleditorwidgets/contextpanewidgetrectangle.cpp b/src/libs/qmleditorwidgets/contextpanewidgetrectangle.cpp index 193d86903d3979fac96afd274fbf077888f924b3..e80df1aabddd17302a723004fb6006bb1f15b508 100644 --- a/src/libs/qmleditorwidgets/contextpanewidgetrectangle.cpp +++ b/src/libs/qmleditorwidgets/contextpanewidgetrectangle.cpp @@ -31,6 +31,7 @@ #include "ui_contextpanewidgetrectangle.h" #include "contextpanewidget.h" #include <qmljs/qmljspropertyreader.h> +#include <qmljs/qmljscheck.h> #include <customcolordialog.h> #include <QDebug> @@ -79,7 +80,7 @@ void ContextPaneWidgetRectangle::setProperties(QmlJS::PropertyReader *propertyRe if (propertyReader->hasProperty(QLatin1String("color"))) { QString str = propertyReader->readProperty("color").toString(); - if (QColor(str).alpha() == 0) + if (QmlJS::toQColor(str).alpha() == 0) m_none = true; ui->colorColorButton->setColor(str); diff --git a/src/libs/qmljs/qmljspropertyreader.cpp b/src/libs/qmljs/qmljspropertyreader.cpp index ac82009381165cabaa628d8c407925ec6695b230..d8e7946ed061567223ee728445fd03bc458834de 100644 --- a/src/libs/qmljs/qmljspropertyreader.cpp +++ b/src/libs/qmljs/qmljspropertyreader.cpp @@ -30,6 +30,7 @@ #include "qmljspropertyreader.h" #include "qmljsdocument.h" #include <qmljs/parser/qmljsast_p.h> +#include <qmljs/qmljscheck.h> namespace QmlJS { @@ -265,7 +266,7 @@ QLinearGradient PropertyReader::parseGradient(const QString &propertyName, bool if (UiObjectDefinition *objectDefinition = cast<UiObjectDefinition *>(member)) { PropertyReader localParser(m_doc, objectDefinition->initializer); if (localParser.hasProperty("color") && localParser.hasProperty("position")) { - QColor color = localParser.readProperty("color").value<QColor>(); + QColor color = QmlJS::toQColor(localParser.readProperty("color").toString()); qreal position = localParser.readProperty("position").toReal(); if (localParser.isBindingOrEnum("color") || localParser.isBindingOrEnum("position")) *isBound = true;