From f8004713a6cbb4e28b6ac617ecbe570a1c8afefe Mon Sep 17 00:00:00 2001 From: hjk <qtc-committer@nokia.com> Date: Wed, 24 Feb 2010 11:05:59 +0100 Subject: [PATCH] qml: compile fix with namespaces --- src/plugins/qmlprojectmanager/fileformat/filefilteritems.h | 2 -- src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.h | 2 -- 2 files changed, 4 deletions(-) diff --git a/src/plugins/qmlprojectmanager/fileformat/filefilteritems.h b/src/plugins/qmlprojectmanager/fileformat/filefilteritems.h index 24744b72426..90178927f19 100644 --- a/src/plugins/qmlprojectmanager/fileformat/filefilteritems.h +++ b/src/plugins/qmlprojectmanager/fileformat/filefilteritems.h @@ -104,11 +104,9 @@ public: } // namespace QmlProjectManager -QT_BEGIN_NAMESPACE QML_DECLARE_TYPE(QmlProjectManager::QmlFileFilterItem) QML_DECLARE_TYPE(QmlProjectManager::JsFileFilterItem) QML_DECLARE_TYPE(QmlProjectManager::ImageFileFilterItem) QML_DECLARE_TYPE(QmlProjectManager::CssFileFilterItem) -QT_END_NAMESPACE #endif // FILEFILTERITEMS_HPROJECTITEM_H diff --git a/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.h b/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.h index 58bff010d9c..ade9791b5f2 100644 --- a/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.h +++ b/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.h @@ -53,10 +53,8 @@ protected: } // namespace QmlProjectManager -QT_BEGIN_NAMESPACE QML_DECLARE_TYPE(QmlProjectManager::QmlProjectItem); QML_DECLARE_TYPE(QmlProjectManager::QmlProjectContentItem); -QT_END_NAMESPACE Q_DECLARE_METATYPE(QList<QmlProjectManager::QmlProjectContentItem *>); -- GitLab