diff options
| author | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2013-05-06 11:21:24 +0200 |
|---|---|---|
| committer | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2013-05-06 12:55:00 +0200 |
| commit | 8371a83ddaa83dfdb6e5577eb9d4c1e5b8d0b5b5 (patch) | |
| tree | 0b0c9bc52b7561e6256b56d898d9edaf4c6e32d8 /src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp | |
| parent | d4b4353a787c9059f64489d6c9f6a9108db28227 (diff) | |
QmlDesigner.ItemLibrary: load QML source on startup
The QML source is now loaded while dragging, which creates
hickups.
Change-Id: If43e4661881f94d6a6f692981f19a61ac2c0e508
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Diffstat (limited to 'src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp')
| -rw-r--r-- | src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp index e137f6f3d6..4b45412555 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp @@ -32,6 +32,8 @@ #include <QSharedData> +#include <utils/fileutils.h> + namespace QmlDesigner { namespace Internal { @@ -51,6 +53,7 @@ public: QIcon dragIcon; QList<PropertyContainer> properties; QString qml; + QString qmlSource; QString requiredImport; bool forceImport; }; @@ -123,6 +126,11 @@ QString ItemLibraryEntry::qml() const return m_data->qml; } +QString ItemLibraryEntry::qmlSource() const +{ + return m_data->qmlSource; +} + QString ItemLibraryEntry::requiredImport() const { return m_data->requiredImport; @@ -183,6 +191,7 @@ void ItemLibraryEntry::setIconPath(const QString &iconPath) void ItemLibraryEntry::setQml(const QString &qml) { m_data->qml = qml; + m_data->qmlSource = Utils::FileReader::fetchQrc(qml); } void ItemLibraryEntry::setRequiredImport(const QString &requiredImport) @@ -217,6 +226,7 @@ QDataStream& operator<<(QDataStream& stream, const ItemLibraryEntry &itemLibrary stream << itemLibraryEntry.m_data->properties; stream << itemLibraryEntry.m_data->qml; + stream << itemLibraryEntry.m_data->qmlSource; return stream; } @@ -236,6 +246,7 @@ QDataStream& operator>>(QDataStream& stream, ItemLibraryEntry &itemLibraryEntry) stream >> itemLibraryEntry.m_data->properties; stream >> itemLibraryEntry.m_data->qml; + stream >> itemLibraryEntry.m_data->qmlSource; return stream; } @@ -255,6 +266,7 @@ QDebug operator<<(QDebug debug, const ItemLibraryEntry &itemLibraryEntry) debug << itemLibraryEntry.m_data->properties; debug << itemLibraryEntry.m_data->qml; + debug << itemLibraryEntry.m_data->qmlSource; return debug.space(); } |