From c7f7585bda4a557c88a08cfca78b903b03eb70cc Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Fri, 26 Feb 2010 15:01:37 +0100
Subject: [PATCH] QmlDesigner: Take some more qml elements out of general Qt
namespace
Reviewed-by: Thomas Hartmann
---
.../qmldesigner/components/propertyeditor/basicwidgets.cpp | 2 +-
.../qmldesigner/components/propertyeditor/qlayoutobject.cpp | 2 +-
.../components/propertyeditor/qproxylayoutitem.cpp | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp
index d64223015fa..e3dbc94fd30 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp
@@ -1204,7 +1204,7 @@ void BasicWidgets::registerDeclarativeTypes()
//QML_REGISTER_TYPE(Bauhaus,1,0,BauhausreeView,BauhausreeView);
//QML_REGISTER_TYPE(Bauhaus,1,0,BauhausableView,BauhausableView);
- QML_REGISTER_TYPE(Qt,4,6,QTabObject,QTabObject); //### with namespacing, this should just be 'Tab'
+ QML_REGISTER_TYPE(Bauhaus,1,0,QTabObject,QTabObject); //### with namespacing, this should just be 'Tab'
}
#include "basicwidgets.moc"
diff --git a/src/plugins/qmldesigner/components/propertyeditor/qlayoutobject.cpp b/src/plugins/qmldesigner/components/propertyeditor/qlayoutobject.cpp
index bced9c1b0ab..df48da4c001 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/qlayoutobject.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/qlayoutobject.cpp
@@ -34,7 +34,7 @@ QT_BEGIN_NAMESPACE
void QLayoutObject::registerDeclarativeType()
{
- QML_REGISTER_TYPE(Qt,4,6,QLayoutObject,QLayoutObject);
+ QML_REGISTER_TYPE(Bauhaus,1,0,QLayoutObject,QLayoutObject);
}
QLayoutObject::QLayoutObject(QObject *parent)
diff --git a/src/plugins/qmldesigner/components/propertyeditor/qproxylayoutitem.cpp b/src/plugins/qmldesigner/components/propertyeditor/qproxylayoutitem.cpp
index 32641129edc..5f1ff79643d 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/qproxylayoutitem.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/qproxylayoutitem.cpp
@@ -160,8 +160,8 @@ QSizeF QProxyLayout::sizeHint(Qt::SizeHint which,
void QProxyLayoutItem::registerDeclarativeTypes()
{
- QML_REGISTER_TYPE(Qt,4,6,LayoutItem,QProxyLayoutItem);
- QML_REGISTER_TYPE(Qt,4,6,ProxyLayout,QProxyLayout);
+ QML_REGISTER_TYPE(Bauhaus,1,0,LayoutItem,QProxyLayoutItem);
+ QML_REGISTER_TYPE(Bauhaus,1,0,ProxyLayout,QProxyLayout);
}
QT_END_NAMESPACE
--
GitLab