← Back to branch summary

~lukas-kde/unity8/dashboard

« back to all changes in this revision

Viewing changes to tests/mocks/Utils/plugin.cpp

  • Committer: Lukáš Tinkl
  • Date: 2017-01-26 12:13:17 UTC
  • mfrom: (2749.1.49 unity8)
  • Revision ID: lukas.tinkl@canonical.com-20170126121317-qms39s9pikclidbe
merge trunk, fix conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/mocks/Utils/plugin.cpp
1
1
/*
2
 
 * Copyright (C) 2015-2016 Canonical, Ltd.
 
2
 * Copyright (C) 2015-2017 Canonical, Ltd.
3
3
 *
4
4
 * This program is free software; you can redistribute it and/or modify
5
5
 * it under the terms of the GNU General Public License as published by
41
41
#include <deviceconfigparser.h>
42
42
#include <globalfunctions.h>
43
43
#include <appdrawerproxymodel.h>
 
44
#include <tabfocusfence.h>
44
45
 
45
46
static QObject *createWindowStateStorage(QQmlEngine *engine, QJSEngine *scriptEngine)
46
47
{
84
85
    qmlRegisterSingletonType<GlobalFunctions>(uri, 0, 1, "Functions", createGlobalFunctions);
85
86
    qmlRegisterType<URLDispatcher>(uri, 0, 1, "URLDispatcher");
86
87
    qmlRegisterType<AppDrawerProxyModel>(uri, 0, 1, "AppDrawerProxyModel");
 
88
    qmlRegisterType<TabFocusFenceItem>(uri, 0, 1, "TabFocusFence");
87
89
}