diff options
author | Kai Koehne <kai.koehne@nokia.com> | 2010-02-26 14:47:44 +0100 |
---|---|---|
committer | Kai Koehne <kai.koehne@nokia.com> | 2010-02-26 14:50:34 +0100 |
commit | dbfe2e7f5e23fca3be73f66a8fb8e36e03deafbf (patch) | |
tree | 8ebf4ff523f7597935a5c94d82e408574611203e /src/plugins/qmldesigner/components/propertyeditor/qlayoutobject.h | |
parent | 4c59f3f2ce811deec85d191bda1462b130842117 (diff) |
QmlDesigner: Fix compilation with latest changes of QDeclarative
All files have been renamed from Qml to QDeclarative.
Registration of types is now done in an initializer method.
QmlView/QDeclarativeView doesn't have an execute method any more.
QDeclarativeMetaObject became private API.
QmlMetaProperty / QDeclarativeProperty has now different API.
Diffstat (limited to 'src/plugins/qmldesigner/components/propertyeditor/qlayoutobject.h')
-rw-r--r-- | src/plugins/qmldesigner/components/propertyeditor/qlayoutobject.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/qmldesigner/components/propertyeditor/qlayoutobject.h b/src/plugins/qmldesigner/components/propertyeditor/qlayoutobject.h index 13b79862b4..a48a5ee5ef 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/qlayoutobject.h +++ b/src/plugins/qmldesigner/components/propertyeditor/qlayoutobject.h @@ -32,7 +32,7 @@ #include <QObject> #include <QLayout> -#include <qml.h> +#include <qdeclarative.h> QT_BEGIN_HEADER @@ -47,6 +47,8 @@ public: QLayoutObject(QObject *parent = 0); virtual QLayout *layout() const; + + static void registerDeclarativeType(); }; QT_END_NAMESPACE |