From 36018e06fb3b4263cd01e617205248d82ffae5fa Mon Sep 17 00:00:00 2001 From: Robin Burchell Date: Mon, 16 Jan 2017 22:20:57 +0100 Subject: Fix up some last un-fixed instances of qmlInfo that should be qmlWarning Seems like I missed some hunks in 3057ec0447943fe022b66a2d19e13d94f9183a7c. Change-Id: I009c838cae856f3fc2e08c7fbc2d3273fc40e221 Reviewed-by: Simon Hausmann --- src/imports/xmllistmodel/qqmlxmllistmodel_p.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/imports/xmllistmodel/qqmlxmllistmodel_p.h') diff --git a/src/imports/xmllistmodel/qqmlxmllistmodel_p.h b/src/imports/xmllistmodel/qqmlxmllistmodel_p.h index 3a4487a085..6605ce9aa6 100644 --- a/src/imports/xmllistmodel/qqmlxmllistmodel_p.h +++ b/src/imports/xmllistmodel/qqmlxmllistmodel_p.h @@ -177,7 +177,7 @@ public: void setQuery(const QString &query) { if (query.startsWith(QLatin1Char('/'))) { - qmlInfo(this) << tr("An XmlRole query must not start with '/'"); + qmlWarning(this) << tr("An XmlRole query must not start with '/'"); return; } if (m_query == query) -- cgit v1.2.3 From 7a8842460dc3c5e4e4ed42e7e2ae5bc619be5c78 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Thu, 5 Jan 2017 16:52:54 +0100 Subject: Q_ENUMS -> Q_ENUM and Q_FLAGS -> Q_FLAG Change-Id: Ibedd0d0c23cf194ea02a229ab643450dbefd40aa Reviewed-by: Shawn Rutledge --- src/imports/xmllistmodel/qqmlxmllistmodel_p.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/imports/xmllistmodel/qqmlxmllistmodel_p.h') diff --git a/src/imports/xmllistmodel/qqmlxmllistmodel_p.h b/src/imports/xmllistmodel/qqmlxmllistmodel_p.h index 6605ce9aa6..e6a0898bb9 100644 --- a/src/imports/xmllistmodel/qqmlxmllistmodel_p.h +++ b/src/imports/xmllistmodel/qqmlxmllistmodel_p.h @@ -79,7 +79,6 @@ class QQuickXmlListModel : public QAbstractListModel, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) - Q_ENUMS(Status) Q_PROPERTY(Status status READ status NOTIFY statusChanged) Q_PROPERTY(qreal progress READ progress NOTIFY progressChanged) @@ -119,6 +118,7 @@ public: Q_INVOKABLE QQmlV4Handle get(int index) const; enum Status { Null, Ready, Loading, Error }; + Q_ENUM(Status) Status status() const; qreal progress() const; -- cgit v1.2.3