Commit 3d8b17ae authored by hjk's avatar hjk
Browse files

qml: compile fix with namespaces

parent b6a99c4e
......@@ -175,13 +175,13 @@ public:
QVBoxLayoutObject(QObject *parent=0);
};
#endif // BASICLAYOUTS_H
QT_END_NAMESPACE
QML_DECLARE_TYPE(QBoxLayoutObject);
QML_DECLARE_TYPE(QHBoxLayoutObject);
QML_DECLARE_TYPE(QVBoxLayoutObject);
QT_END_NAMESPACE
QT_END_HEADER
#endif // BASICLAYOUTS_H
......@@ -1168,8 +1168,6 @@ public:
{}
};
QT_END_NAMESPACE
QML_DEFINE_EXTENDED_TYPE(Bauhaus,1,0,QWidget,QWidget,QWidgetDeclarativeUI);
//display
......@@ -1232,4 +1230,6 @@ QML_DEFINE_EXTENDED_TYPE(Bauhaus,1,0,QMenu,QMenu, QMenuDeclarativeUI)
QML_DECLARE_TYPE(QTabObject);
QML_DEFINE_TYPE(Qt,4,6,QTabObject,QTabObject); //### with namespacing, this should just be 'Tab'
QT_END_NAMESPACE
#include "basicwidgets.moc"
......@@ -57,6 +57,8 @@
#include "filewidget.h"
#include "layoutwidget.h"
QT_BEGIN_NAMESPACE
QML_DECLARE_TYPE(QWidget);
//display
......@@ -94,16 +96,12 @@ QML_DECLARE_TYPE(QTabWidget);
QML_DECLARE_TYPE(FileWidget);
QML_DECLARE_TYPE(LayoutWidget);
QT_BEGIN_NAMESPACE
class Action : public QAction {
Q_OBJECT
public:
Action(QObject *parent = 0) : QAction(parent) {}
};
QT_END_NAMESPACE
QML_DECLARE_TYPE(QMenu);
QML_DECLARE_TYPE(Action);
......@@ -116,4 +114,6 @@ QML_DECLARE_TYPE(Action);
//top-level windows?
QT_END_NAMESPACE
#endif // BASICWIDGETS_H
......@@ -93,6 +93,8 @@ private:
};
QT_BEGIN_NAMESPACE
QML_DECLARE_TYPE(QmlDesigner::BehaviorWidget);
QT_END_NAMESPACE
#endif// BEHAVIORDIALOG_H
......@@ -301,8 +301,10 @@ private:
} //QmlDesigner
QT_BEGIN_NAMESPACE
QML_DECLARE_TYPE(QmlDesigner::ColorButton);
QML_DECLARE_TYPE(QmlDesigner::HueControl);
QML_DECLARE_TYPE(QmlDesigner::ColorBox);
QT_END_NAMESPACE
#endif //COLORWIDGET_H
......@@ -96,6 +96,8 @@ private: //variables
} // namespace QmlDesigner
QT_BEGIN_NAMESPACE
QML_DECLARE_TYPE(QmlDesigner::FontWidget);
QT_END_NAMESPACE
#endif // FONTWIDGET_H
......@@ -146,9 +146,11 @@ private: //variables
QmlDesigner::RewriterTransaction m_rewriterTransaction;
};
QT_BEGIN_NAMESPACE
QML_DECLARE_TYPE(PropertyEditorValue);
QML_DECLARE_TYPE(PropertyEditorNodeWrapper);
QML_DECLARE_TYPE(QmlPropertyMap);
QT_END_NAMESPACE
#endif // PROPERTYEDITORVALUE_H
......@@ -49,10 +49,10 @@ public:
virtual QLayout *layout() const;
};
QT_END_NAMESPACE
QML_DECLARE_TYPE(QLayoutObject);
QT_END_NAMESPACE
QT_END_HEADER
#endif // QLAYOUTOBJECT_H
......@@ -87,11 +87,12 @@ private:
QGraphicsLayoutItem *other;
};
#endif // QPROXYLAYOUTITEM_H
QT_END_NAMESPACE
QML_DECLARE_TYPE(QProxyLayout);
QML_DECLARE_TYPE(QProxyLayoutItem);
QT_END_NAMESPACE
QT_END_HEADER
#endif // QPROXYLAYOUTITEM_H
......@@ -40,9 +40,10 @@
#include <QDebug>
#include <QApplication>
QT_BEGIN_NAMESPACE
QML_DECLARE_TYPE(QmlDesigner::ResetWidget);
QML_DEFINE_TYPE(Bauhaus, 1, 0, ResetWidget, QmlDesigner::ResetWidget);
QT_END_NAMESPACE
namespace QmlDesigner {
......
......@@ -98,6 +98,8 @@ protected:
} // namespace Internal
} // namespace QmlDesigner
QT_BEGIN_NAMESPACE
QML_DECLARE_TYPE(QmlDesigner::Internal::QmlPropertyChangesObject)
QT_END_NAMESPACE
#endif // QMLPROPERTYCHANGESNODEINSTANCE_H
......@@ -104,9 +104,11 @@ 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
......@@ -53,9 +53,11 @@ protected:
} // namespace QmlProjectManager
QT_BEGIN_NAMESPACE
QML_DECLARE_TYPE(QmlProjectManager::QmlProjectItem);
QML_DECLARE_TYPE(QmlProjectManager::QmlProjectContentItem);
Q_DECLARE_METATYPE(QList<QmlProjectManager::QmlProjectContentItem *>);
QT_DECLARE_METATYPE(QList<QmlProjectManager::QmlProjectContentItem *>);
QT_END_NAMESPACE
#endif // PROJECTITEM_H
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment