diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-24 04:36:01 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-24 04:36:01 (GMT) |
| commit | 2e2ce693e16899dcfd1f39374a78bf2ca3a0e016 (patch) | |
| tree | e6fe4b5938c3a4a40c66301b16794d0b16c4e5f9 /src/declarative/util/qdeclarativexmllistmodel_p.h | |
| parent | cb23151d3abfdbdf291abe8a1510592db2011927 (diff) | |
| parent | ff27b0e6a7161db17335dc4aa8724cae75cec39c (diff) | |
| download | Qt-2e2ce693e16899dcfd1f39374a78bf2ca3a0e016.zip Qt-2e2ce693e16899dcfd1f39374a78bf2ca3a0e016.tar.gz Qt-2e2ce693e16899dcfd1f39374a78bf2ca3a0e016.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Check QML files for license headers too.
Make compile: include script module for test
Move copies of toLocalFileOrQrc() to QDeclarativeEnginePrivate
Allow resource files to be loaded in WorkerScript
Fix TextEdit alignment.
Component::createObject() don't attempt to set parent of null object
Factor out initialization effects from declarative benchmarks.
Remove license headers from test data.
Fix FolderListModel parentFolder property's file drive handling
Add license headers for .qml files.
Ensure QML Global Qt object functions appear in the documentation index
doc
Also show file/line numbers on XML query errors.
Print warnings for xml query syntax errors
Clean up
Add XmlListModel::get()
Diffstat (limited to 'src/declarative/util/qdeclarativexmllistmodel_p.h')
| -rw-r--r-- | src/declarative/util/qdeclarativexmllistmodel_p.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/declarative/util/qdeclarativexmllistmodel_p.h b/src/declarative/util/qdeclarativexmllistmodel_p.h index 7101c57..8d848c8 100644 --- a/src/declarative/util/qdeclarativexmllistmodel_p.h +++ b/src/declarative/util/qdeclarativexmllistmodel_p.h @@ -47,6 +47,7 @@ #include <QtCore/qurl.h> #include <QtCore/qstringlist.h> +#include <QtScript/qscriptvalue.h> #include <private/qlistmodelinterface_p.h> @@ -109,6 +110,8 @@ public: QString namespaceDeclarations() const; void setNamespaceDeclarations(const QString&); + Q_INVOKABLE QScriptValue get(int index) const; + enum Status { Null, Ready, Loading, Error }; Status status() const; qreal progress() const; @@ -139,6 +142,7 @@ private Q_SLOTS: void requestProgress(qint64,qint64); void dataCleared(); void queryCompleted(const QDeclarativeXmlQueryResult &); + void queryError(void* object, const QString& error); private: Q_DECLARE_PRIVATE(QDeclarativeXmlListModel) |