From bb8356abb0ee4114281e0754abf94757b4ccfba2 Mon Sep 17 00:00:00 2001
From: Marco Martin <notmart@gmail.com>
Date: Thu, 7 Feb 2013 12:48:05 +0100
Subject: [PATCH] reenable theme

many qml components work now
---
 declarativeimports/core/CMakeLists.txt         |  2 +-
 declarativeimports/core/corebindingsplugin.cpp | 10 +++++-----
 declarativeimports/core/theme.cpp              |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/declarativeimports/core/CMakeLists.txt b/declarativeimports/core/CMakeLists.txt
index 2d0376f74..a34ea259a 100644
--- a/declarativeimports/core/CMakeLists.txt
+++ b/declarativeimports/core/CMakeLists.txt
@@ -4,7 +4,7 @@ set(corebindings_SRCS
 #     declarativeitemcontainer.cpp
     corebindingsplugin.cpp
 #     dataengineconsumer.cpp
-#     theme.cpp
+     theme.cpp
 #     datamodel.cpp
 #     datasource.cpp
 #     runnermodel.cpp
diff --git a/declarativeimports/core/corebindingsplugin.cpp b/declarativeimports/core/corebindingsplugin.cpp
index c4ab894c9..021ead0e0 100644
--- a/declarativeimports/core/corebindingsplugin.cpp
+++ b/declarativeimports/core/corebindingsplugin.cpp
@@ -37,7 +37,7 @@
 #include "framesvgitem.h"
 // #include "runnermodel.h"
 #include "svgitem.h"
-// #include "theme.h"
+#include "theme.h"
 // #include "dialog.h"
 #include "iconitem.h"
 // #include "tooltip.h"
@@ -50,11 +50,11 @@ void CoreBindingsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
     QQmlExtensionPlugin::initializeEngine(engine, uri);
 
     QQmlContext *context = engine->rootContext();
-/*
+
     ThemeProxy *theme = new ThemeProxy(context);
     context->setContextProperty("theme", theme);
 
-    KDeclarative kdeclarative;
+/*    KDeclarative kdeclarative;
     kdeclarative.setDeclarativeEngine(engine);
     kdeclarative.initialize();
     QScriptEngine *scriptEngine = kdeclarative.scriptEngine();
@@ -78,8 +78,8 @@ void CoreBindingsPlugin::registerTypes(const char *uri)
     qmlRegisterType<Plasma::FrameSvg>(uri, 0, 1, "FrameSvg");
     qmlRegisterType<Plasma::SvgItem>(uri, 0, 1, "SvgItem");
     qmlRegisterType<Plasma::FrameSvgItem>(uri, 0, 1, "FrameSvgItem");
-// 
-//     qmlRegisterType<ThemeProxy>(uri, 0, 1, "Theme");
+ 
+    qmlRegisterType<ThemeProxy>(uri, 0, 1, "Theme");
 // 
 //     qmlRegisterType<Plasma::DataSource>(uri, 0, 1, "DataSource");
 //     qmlRegisterType<Plasma::DataModel>(uri, 0, 1, "DataModel");
diff --git a/declarativeimports/core/theme.cpp b/declarativeimports/core/theme.cpp
index 684294b2b..439af34e0 100644
--- a/declarativeimports/core/theme.cpp
+++ b/declarativeimports/core/theme.cpp
@@ -38,7 +38,7 @@ public:
    FontProxy smallestFont;
 };
 
-K_GLOBAL_STATIC(FontProxySingleton, privateFontProxySingleton)
+Q_GLOBAL_STATIC(FontProxySingleton, privateFontProxySingleton)
 
 FontProxy::FontProxy(Plasma::Theme::FontRole role, QObject *parent)
     : QObject(parent),