From ad80aa20aef1bf6d8b3e685e4f2d46c46cc98c04 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Fri, 24 Jun 2011 16:09:46 +0200 Subject: [PATCH] QmlDesigner.itemLibraryInfo: add qml property for library Change-Id: I986cef3a15d6332f1dcf7c0ca4cd035cc0751e76 Reviewed-on: http://codereview.qt.nokia.com/719 Reviewed-by: Qt Sanity Bot Reviewed-by: Thomas Hartmann --- .../designercore/metainfo/itemlibraryinfo.cpp | 2 ++ .../designercore/metainfo/metainfoparser.cpp | 13 +++++++++++++ 2 files changed, 15 insertions(+) diff --git a/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp index a8339961b36..7f7c66a33e8 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp @@ -227,6 +227,7 @@ QDataStream& operator<<(QDataStream& stream, const ItemLibraryEntry &itemLibrary stream << itemLibraryEntry.forceImport(); stream << itemLibraryEntry.m_data->properties; + stream << itemLibraryEntry.m_data->qml; return stream; } @@ -245,6 +246,7 @@ QDataStream& operator>>(QDataStream& stream, ItemLibraryEntry &itemLibraryEntry) stream >> itemLibraryEntry.m_data->forceImport; stream >> itemLibraryEntry.m_data->properties; + stream >> itemLibraryEntry.m_data->qml; return stream; } diff --git a/src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp b/src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp index 22d45f51f0a..f73d6daecc9 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp @@ -163,6 +163,7 @@ void MetaInfoParser::handleNodeItemLibraryEntryElement(QXmlStreamReader &reader, while (!reader.atEnd() && !(reader.isEndElement() && reader.name() == "itemlibraryentry")) { reader.readNext(); handleItemLibraryEntryPropertyElement(reader, entry); + handleItemLibraryEntryQmlElement(reader, entry); } m_metaInfo.itemLibraryInfo()->addEntry(entry); @@ -183,6 +184,18 @@ void MetaInfoParser::handleItemLibraryEntryPropertyElement(QXmlStreamReader &rea } } +void MetaInfoParser::handleItemLibraryEntryQmlElement(QXmlStreamReader &reader, ItemLibraryEntry &itemLibraryEntry) +{ + if (reader.isStartElement() && reader.name() == "qml") + { + QXmlStreamAttributes attributes(reader.attributes()); + QString source = attributes.value("source").toString(); + itemLibraryEntry.setQml(source); + + reader.readNext(); + } +} + void MetaInfoParser::errorHandling(QXmlStreamReader &reader, QFile &file) { if (!reader.hasError())