From 4f711a67fc0675707f01a7bb3ac27fc334e29de3 Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Mon, 9 Jan 2012 12:41:21 +0100 Subject: [PATCH] correctly load the dialog component --- .../plasmacomponents/plasmacomponentsplugin.cpp | 5 ++++- declarativeimports/plasmacomponents/qmenu.cpp | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/declarativeimports/plasmacomponents/plasmacomponentsplugin.cpp b/declarativeimports/plasmacomponents/plasmacomponentsplugin.cpp index 065aa2527..28374bc89 100644 --- a/declarativeimports/plasmacomponents/plasmacomponentsplugin.cpp +++ b/declarativeimports/plasmacomponents/plasmacomponentsplugin.cpp @@ -27,11 +27,13 @@ #include "qrangemodel.h" #include +#include #include "enums.h" #include "qmenu.h" #include "qmenuitem.h" #include "kdialogproxy.h" +#include "fullscreendialog.h" Q_EXPORT_PLUGIN2(plasmacomponentsplugin, PlasmaComponentsPlugin) @@ -52,7 +54,7 @@ EngineBookKeeping *EngineBookKeeping::self() } QDeclarativeEngine *EngineBookKeeping::engineFor(QObject *item) const -{ +{return m_engines.values().first(); foreach (QDeclarativeEngine *engine, m_engines) { QObject *root = engine->rootContext()->contextObject(); QObject *candidate = item; @@ -96,6 +98,7 @@ void PlasmaComponentsPlugin::registerTypes(const char *uri) qmlRegisterType(uri, 0, 1, "MenuItem"); } + qmlRegisterType(uri, 0, 1, "FullScreenDialog"); qmlRegisterType(uri, 0, 1, "RangeModel"); qmlRegisterUncreatableType(uri, 0, 1, "DialogStatus", ""); diff --git a/declarativeimports/plasmacomponents/qmenu.cpp b/declarativeimports/plasmacomponents/qmenu.cpp index 03b91624e..6e00dbace 100644 --- a/declarativeimports/plasmacomponents/qmenu.cpp +++ b/declarativeimports/plasmacomponents/qmenu.cpp @@ -30,7 +30,7 @@ QMenuProxy::QMenuProxy (QObject *parent) : QObject(parent), m_status(DialogStatus::Closed) -{qDebug()<<"AAAAAA"<engineFor(this); +{ m_menu = new QMenu(0); connect(m_menu, SIGNAL(triggered(QAction *)), this, SLOT(itemTriggered(QAction *)));