From def8944fc009f36d49d6694c6665f2f59372158b Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@nokia.com>
Date: Wed, 13 Oct 2010 16:18:49 +0200
Subject: [PATCH] QmlDesigner: Use Meego
---
.../qmldesigner/qtquickplugin/qtquickplugin.cpp | 14 ++++++++++++--
.../qmldesigner/qtquickplugin/qtquickplugin.pri | 2 +-
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.cpp b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.cpp
index 1480471785d..0d02d4bb98e 100644
--- a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.cpp
+++ b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.cpp
@@ -32,14 +32,24 @@
#include <QtCore/QtPlugin>
#include <private/qdeclarativerectangle_p.h>
#include <private/qdeclarativescalegrid_p_p.h>
+#include <MComponentData>
namespace QmlDesigner {
QtQuickPlugin::QtQuickPlugin()
{
- qmlRegisterType<QDeclarativePen>("QtQuick", 1, 0, "Pen");
- qmlRegisterType<QDeclarativeScaleGrid>("QtQuick", 1, 0, "ScaleGrid");
+ qApp->setProperty("NoMStyle", true);
+ if(!MComponentData::instance()) {
+ // This is a workaround because we can't use a default
+ // constructor for MComponentData
+ int argc = 1;
+ char *argv0 = "meegotouch";
+ (void) new MComponentData(argc, &argv0);
+ }
+
+ qmlRegisterType<QDeclarativePen>("Qt", 4, 7, "Pen");
+ qmlRegisterType<QDeclarativeScaleGrid>("Qt", 4, 7, "ScaleGrid");
}
QString QtQuickPlugin::pluginName()
diff --git a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.pri b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.pri
index 5870c378726..1436a03d1eb 100644
--- a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.pri
+++ b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.pri
@@ -1,6 +1,6 @@
TARGET = qtquickplugin
TEMPLATE = lib
-CONFIG += plugin
+CONFIG += plugin meegotouch
QT += script \
declarative
--
GitLab