diff --git a/src/declarativeimports/core/CMakeLists.txt b/src/declarativeimports/core/CMakeLists.txt index f63d6e226..4c1296666 100644 --- a/src/declarativeimports/core/CMakeLists.txt +++ b/src/declarativeimports/core/CMakeLists.txt @@ -15,7 +15,6 @@ endif() set(corebindings_SRCS corebindingsplugin.cpp - theme.cpp datamodel.cpp datasource.cpp dialogshadows.cpp diff --git a/src/declarativeimports/core/corebindingsplugin.cpp b/src/declarativeimports/core/corebindingsplugin.cpp index acc7cb76f..7574c3180 100644 --- a/src/declarativeimports/core/corebindingsplugin.cpp +++ b/src/declarativeimports/core/corebindingsplugin.cpp @@ -56,7 +56,7 @@ void CoreBindingsPlugin::initializeEngine(QQmlEngine *engine, const char *uri) QQmlContext *context = engine->rootContext(); - ThemeProxy *theme = new ThemeProxy(engine); + Plasma::Theme *theme = new Plasma::Theme(engine); context->setContextProperty("theme", theme); if (!engine->rootContext()->contextObject()) { @@ -78,7 +78,7 @@ void CoreBindingsPlugin::registerTypes(const char *uri) qmlRegisterType(uri, 2, 0, "FrameSvgItem"); //qmlRegisterType(uri, 2, 0, "Theme"); - qmlRegisterType(); + qmlRegisterType(); qmlRegisterType(uri, 2, 0, "DataSource"); qmlRegisterType(uri, 2, 0, "DataModel"); diff --git a/src/declarativeimports/core/theme.cpp b/src/declarativeimports/core/theme.cpp index ba26631cd..9ba196d69 100644 --- a/src/declarativeimports/core/theme.cpp +++ b/src/declarativeimports/core/theme.cpp @@ -66,26 +66,6 @@ QQmlPropertyMap *ThemeProxy::iconSizes() const return m_iconSizes; } -int ThemeProxy::dpi(QQuickItem* item) -{ - int _dpi = 1337; - qDebug() << " ----- dpi() ---- "; - if (item) { - QScreen* screen = item->window()->screen(); - if (screen) { - qDebug() << "screen geo: " << screen->availableGeometry(); - _dpi = screen->physicalDotsPerInch(); - qDebug() << " refreshRate : " << screen->refreshRate(); - qDebug() << " devicePixelRatio: " << screen->devicePixelRatio(); - qDebug() << " depth : " << screen->depth(); - qDebug() << " dpi X: " << screen->physicalDotsPerInchX(); - qDebug() << " dpi Y: " << screen->physicalDotsPerInchY(); - qDebug() << " ->> dpi: " << _dpi; - } - } - return _dpi; -} - #include "moc_theme.cpp"