aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2018-03-26 10:50:07 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2018-03-27 13:50:59 +0000
commitcc6eef647302426ae6ef0759b9f59fd14e57bd1e (patch)
treee102ac956d01940ed18cf71082bb69fa2903b70c /src/quick
parent9a2cfd515534c336e867a9d33a3d99b6c6ebd1a1 (diff)
Quick/DesignerSupport: Use QByteArrayList when checking property lists
Fix warnings like designer/qquickdesignersupportitems.cpp:112:63: warning: 'QString::QString(const char*)' is deprecated: Use fromUtf8, QStringLiteral, or QLatin1String [-Wdeprecated-declarations] Amends 01a40e1f920b58f00d52ff4542f6ef9c606a9b03. Change-Id: I0e8167f8eacc0d901f79fb5dd8b2772ab29c55a8 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Diffstat (limited to 'src/quick')
-rw-r--r--src/quick/designer/qquickdesignercustomobjectdata.cpp4
-rw-r--r--src/quick/designer/qquickdesignersupportitems.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/quick/designer/qquickdesignercustomobjectdata.cpp b/src/quick/designer/qquickdesignercustomobjectdata.cpp
index daa9486f02..8989de711e 100644
--- a/src/quick/designer/qquickdesignercustomobjectdata.cpp
+++ b/src/quick/designer/qquickdesignercustomobjectdata.cpp
@@ -149,11 +149,11 @@ void QQuickDesignerCustomObjectData::populateResetHashes()
QQuickDesignerSupportProperties::propertyNameListForWritableProperties(object());
const QMetaObject *mo = object()->metaObject();
- QStringList deferredPropertyNames;
+ QByteArrayList deferredPropertyNames;
const int namesIndex = mo->indexOfClassInfo("DeferredPropertyNames");
if (namesIndex != -1) {
QMetaClassInfo classInfo = mo->classInfo(namesIndex);
- deferredPropertyNames = QString::fromUtf8(classInfo.value()).split(QLatin1Char(','));
+ deferredPropertyNames = QByteArray(classInfo.value()).split(',');
}
for (const QQuickDesignerSupport::PropertyName &propertyName : propertyNameList) {
diff --git a/src/quick/designer/qquickdesignersupportitems.cpp b/src/quick/designer/qquickdesignersupportitems.cpp
index 82474827aa..1c338fa79d 100644
--- a/src/quick/designer/qquickdesignersupportitems.cpp
+++ b/src/quick/designer/qquickdesignersupportitems.cpp
@@ -96,11 +96,11 @@ static void allSubObjects(QObject *object, QObjectList &objectList)
const QMetaObject *mo = object->metaObject();
- QStringList deferredPropertyNames;
+ QByteArrayList deferredPropertyNames;
const int namesIndex = mo->indexOfClassInfo("DeferredPropertyNames");
if (namesIndex != -1) {
QMetaClassInfo classInfo = mo->classInfo(namesIndex);
- deferredPropertyNames = QString::fromUtf8(classInfo.value()).split(QLatin1Char(','));
+ deferredPropertyNames = QByteArray(classInfo.value()).split(',');
}
for (int index = QObject::staticMetaObject.propertyOffset();