summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@nokia.com>2010-02-22 16:36:01 +0100
committerKai Koehne <kai.koehne@nokia.com>2010-02-22 16:37:38 +0100
commitdfa7f8093e59711a369f5a49272e4130c530db3f (patch)
tree35fa342664fa3e8bfb0e46a5b07568f5706b50e4 /src
parentfaf2df28e183fdb42ae6166d05df892f17f35454 (diff)
downloadqt-creator-dfa7f8093e59711a369f5a49272e4130c530db3f.tar.gz
Fix qmldesigner autotests
The registration of the qml items have been recently moved from a static context into QmlGraphicsItemModule::initialization . The Bauhaus Metainfo initialization now ensures that this method is called first by instantating a QmlEngine.
Diffstat (limited to 'src')
-rw-r--r--src/plugins/qmldesigner/core/metainfo/metainfo.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/plugins/qmldesigner/core/metainfo/metainfo.cpp b/src/plugins/qmldesigner/core/metainfo/metainfo.cpp
index 71448ab336..18dacbea75 100644
--- a/src/plugins/qmldesigner/core/metainfo/metainfo.cpp
+++ b/src/plugins/qmldesigner/core/metainfo/metainfo.cpp
@@ -44,6 +44,7 @@
#include <QPair>
#include <QtAlgorithms>
#include <QMetaProperty>
+#include <QmlEngine>
#include <QmlMetaType>
#include <private/qmlgraphicsanchors_p.h>
@@ -106,6 +107,11 @@ void MetaInfoPrivate::clear()
void MetaInfoPrivate::initialize()
{
+ // make sure QmlGraphicsItemsModule gets initialized, that is
+ // QmlGraphicsItemsModule::defineModule called
+ QmlEngine engine;
+ Q_UNUSED(engine);
+
parseQmlTypes();
parseNonQmlTypes();
parseValueTypes();