diff options
| author | Thomas Hartmann <Thomas.Hartmann@theqtcompany.com> | 2015-07-22 14:39:15 +0200 |
|---|---|---|
| committer | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2015-07-22 19:20:37 +0000 |
| commit | bc7dff35723e8f2cf09660b94f7fba9e8478860f (patch) | |
| tree | c7a537c584a221e25428283571ca9dbe46935e50 /src/quick/designer | |
| parent | d3a792e7a9c41a6710a953ea4af266d41ee9d261 (diff) | |
Property names can be utf8
Change-Id: Ib337fa9a366725b8f0491a4816597fa5baeef7a9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Diffstat (limited to 'src/quick/designer')
| -rw-r--r-- | src/quick/designer/qquickdesignersupportproperties.cpp | 2 | ||||
| -rw-r--r-- | src/quick/designer/qquickdesignersupportpropertychanges.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/designer/qquickdesignersupportproperties.cpp b/src/quick/designer/qquickdesignersupportproperties.cpp index 300ad6d53e..08ba8c8675 100644 --- a/src/quick/designer/qquickdesignersupportproperties.cpp +++ b/src/quick/designer/qquickdesignersupportproperties.cpp @@ -140,7 +140,7 @@ QQuickDesignerSupport::PropertyNameList QQuickDesignerSupportProperties::propert const QMetaObject *metaObject = object->metaObject(); for (int index = 0; index < metaObject->propertyCount(); ++index) { QMetaProperty metaProperty = metaObject->property(index); - QQmlProperty declarativeProperty(object, QLatin1String(metaProperty.name())); + QQmlProperty declarativeProperty(object, QString::fromUtf8(metaProperty.name())); if (declarativeProperty.isValid() && !declarativeProperty.isWritable() && declarativeProperty.propertyTypeCategory() == QQmlProperty::Object) { if (declarativeProperty.name() != QLatin1String("parent")) { QObject *childObject = QQmlMetaType::toQObject(declarativeProperty.read()); diff --git a/src/quick/designer/qquickdesignersupportpropertychanges.cpp b/src/quick/designer/qquickdesignersupportpropertychanges.cpp index b8706fc880..92fa637b54 100644 --- a/src/quick/designer/qquickdesignersupportpropertychanges.cpp +++ b/src/quick/designer/qquickdesignersupportpropertychanges.cpp @@ -65,7 +65,7 @@ void QQuickDesignerSupportPropertyChanges::removeProperty(QObject *propertyChang if (!propertyChange) return; - propertyChange->removeProperty(QString::fromLatin1(propertyName)); + propertyChange->removeProperty(QString::fromUtf8(propertyName)); } QVariant QQuickDesignerSupportPropertyChanges::getProperty(QObject *propertyChanges, @@ -76,7 +76,7 @@ QVariant QQuickDesignerSupportPropertyChanges::getProperty(QObject *propertyChan if (!propertyChange) return QVariant(); - return propertyChange->property(QString::fromLatin1(propertyName)); + return propertyChange->property(QString::fromUtf8(propertyName)); } void QQuickDesignerSupportPropertyChanges::changeValue(QObject *propertyChanges, |