diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-05-19 02:44:07 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-05-19 02:44:07 (GMT) |
| commit | a0973fe3b88dbef39e42da584e63a210693342ee (patch) | |
| tree | f3edf45c2c9dff62a3f5f1cf9fb3c5762ce7e887 /src/imports | |
| parent | cd707a865625c7ee0ec836d2a1bdcda847ab0517 (diff) | |
| parent | e007505d8f35c1194caf80ffc4f1e46561ff7be3 (diff) | |
| download | Qt-a0973fe3b88dbef39e42da584e63a210693342ee.zip Qt-a0973fe3b88dbef39e42da584e63a210693342ee.tar.gz Qt-a0973fe3b88dbef39e42da584e63a210693342ee.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Conflicts:
src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp
src/imports/folderlistmodel/qdeclarativefolderlistmodel.h
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp | 3 | ||||
| -rw-r--r-- | src/imports/folderlistmodel/qdeclarativefolderlistmodel.h | 10 |
2 files changed, 13 insertions, 0 deletions
diff --git a/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp b/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp index 0a75edf..6a7383a 100644 --- a/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp +++ b/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp @@ -45,6 +45,8 @@ #include <QDebug> #include <qdeclarativecontext.h> +QT_BEGIN_NAMESPACE + class QDeclarativeFolderListModelPrivate { public: @@ -396,3 +398,4 @@ void QDeclarativeFolderListModel::setShowOnlyReadable(bool on) } //![code] +QT_END_NAMESPACE diff --git a/src/imports/folderlistmodel/qdeclarativefolderlistmodel.h b/src/imports/folderlistmodel/qdeclarativefolderlistmodel.h index 87141c5..ea7d701 100644 --- a/src/imports/folderlistmodel/qdeclarativefolderlistmodel.h +++ b/src/imports/folderlistmodel/qdeclarativefolderlistmodel.h @@ -47,6 +47,12 @@ #include <QUrl> #include <QAbstractListModel> +QT_BEGIN_HEADER + +QT_BEGIN_NAMESPACE + +QT_MODULE(Declarative) + class QDeclarativeContext; class QModelIndex; @@ -138,8 +144,12 @@ private: }; //![class end] +QT_END_NAMESPACE + //![qml decl] QML_DECLARE_TYPE(QDeclarativeFolderListModel) //![qml decl] +QT_END_HEADER + #endif // QDECLARATIVEFOLDERLISTMODEL_H |