← Back to branch summary

~alan-griffiths/miral/fix-1621917

« back to all changes in this revision

Viewing changes to miral-qt/src/modules/Unity/Application/plugin.cpp

  • Committer: Alan Griffiths
  • Date: 2016-09-09 13:28:01 UTC
  • mfrom: (320.2.3 miral)
  • Revision ID: alam@octopull.co.uk-20160909132801-1rmrc2tl74qrhhkl
merge :parent

Show diffs side-by-side

added added

removed removed

Lines of Context:
miral-qt/src/modules/Unity/Application/plugin.cpp
21
21
#include "application.h"
22
22
#include "application_manager.h"
23
23
#include "mirfocuscontroller.h"
24
 
#include "mirsurfacemanager.h"
25
24
#include "mirsurfaceinterface.h"
26
25
#include "mirsurfaceitem.h"
27
26
#include "mirsurfacelistmodel.h"
47
46
    return qtmir::ApplicationManager::singleton();
48
47
}
49
48
 
50
 
QObject* surfaceManagerSingleton(QQmlEngine* engine, QJSEngine* scriptEngine) {
51
 
    Q_UNUSED(engine);
52
 
    Q_UNUSED(scriptEngine);
53
 
    qCDebug(QTMIR_APPLICATIONS) << "surfaceManagerSingleton - engine=" << engine << "scriptEngine=" << scriptEngine;
54
 
 
55
 
    return qtmir::MirSurfaceManager::singleton();
56
 
}
57
 
 
58
49
QObject* mirSingleton(QQmlEngine* /*engine*/, QJSEngine* /*scriptEngine*/) {
59
50
    return qtmir::Mir::instance();
60
51
}
88
79
                    uri, 0, 1, "ApplicationInfoInterface", "Abstract interface. Cannot be created in QML");
89
80
        qmlRegisterUncreatableType<qtmir::Application>(
90
81
                    uri, 0, 1, "ApplicationInfo", "Application can't be instantiated");
91
 
        qmlRegisterSingletonType<qtmir::MirSurfaceManager>(
92
 
                    uri, 0, 1, "SurfaceManager", surfaceManagerSingleton);
93
82
        qmlRegisterSingletonType<MirFocusController>(uri, 0, 1, "MirFocusController", mirFocusControllerSingleton);
94
83
        qmlRegisterUncreatableType<unity::shell::application::MirSurfaceInterface>(
95
84
                    uri, 0, 1, "MirSurface", "MirSurface can't be instantiated from QML");