From a0b11de0456feb471cdea5cb36951869295e4d8e Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Mon, 1 Mar 2010 10:28:12 +0100
Subject: [PATCH] compile fix with namespaces
---
.../qmldesigner/components/propertyeditor/basiclayouts.cpp | 3 ++-
.../qmldesigner/components/propertyeditor/basicwidgets.cpp | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/plugins/qmldesigner/components/propertyeditor/basiclayouts.cpp b/src/plugins/qmldesigner/components/propertyeditor/basiclayouts.cpp
index 8a5a2f53608..2565faf3bab 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/basiclayouts.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/basiclayouts.cpp
@@ -67,6 +67,8 @@ QVBoxLayoutObject::QVBoxLayoutObject(QObject *parent)
{
}
+QT_END_NAMESPACE
+
void BasicLayouts::registerDeclarativeTypes()
{
QML_REGISTER_TYPE(Bauhaus,1,0,QBoxLayout,QBoxLayoutObject);
@@ -74,4 +76,3 @@ void BasicLayouts::registerDeclarativeTypes()
QML_REGISTER_TYPE(Bauhaus,1,0,QVBoxLayout,QVBoxLayoutObject);
}
-QT_END_NAMESPACE
diff --git a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp
index 61292ceafb0..bec23300326 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp
@@ -1204,6 +1204,7 @@ public:
{}
};
+QT_END_NAMESPACE
QML_DECLARE_TYPE(QTabObject);
QML_DECLARE_TYPE(MyGroupBox);
--
GitLab