From 2108142dcd0a2dbb639443b594eb2c1c24e480cc Mon Sep 17 00:00:00 2001
From: Martin Jones <martin.jones@nokia.com>
Date: Wed, 19 May 2010 10:16:36 +1000
Subject: Fix folderlistmodel with qt namespace

---
 src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp |  4 ++++
 src/imports/folderlistmodel/qdeclarativefolderlistmodel.h   | 10 ++++++++++
 2 files changed, 14 insertions(+)

diff --git a/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp b/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp
index a16f0c6..2ff7412 100644
--- a/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp
+++ b/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp
@@ -44,6 +44,8 @@
 #include <QDebug>
 #include <qdeclarativecontext.h>
 
+QT_BEGIN_NAMESPACE
+
 class QDeclarativeFolderListModelPrivate
 {
 public:
@@ -387,3 +389,5 @@ void QDeclarativeFolderListModel::setShowOnlyReadable(bool on)
     else
         d->model.setFilter(d->model.filter() & ~QDir::Readable);
 }
+
+QT_END_NAMESPACE
diff --git a/src/imports/folderlistmodel/qdeclarativefolderlistmodel.h b/src/imports/folderlistmodel/qdeclarativefolderlistmodel.h
index e610a14..dbde4c0 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;
 
@@ -119,6 +125,10 @@ private:
     QDeclarativeFolderListModelPrivate *d;
 };
 
+QT_END_NAMESPACE
+
 QML_DECLARE_TYPE(QDeclarativeFolderListModel)
 
+QT_END_HEADER
+
 #endif // QDECLARATIVEFOLDERLISTMODEL_H
-- 
cgit v0.12