a550870 · unity8 · git.iko.soy

git.iko.soy/unity8

merge daniel's focus-fixing branch

commita550870bd9c27e28dfcd80c2eecc0619867bb2fe authorMichael Zanetti <michael.zanetti@canonical.com> dateWed 1 Apr 2015, 12:04 (12 years ago) parent8141274

2 files changed+3

compare with xenial

unifiedsplit

tests/mocks/Utils/CMakeLists.txt+1 tests/mocks/Utils/plugin.cpp+2

tests/mocks/Utils/CMakeLists.txt+1

@@ -16,6 +16,7 @@ set(QMLPLUGIN_SRC

1616 ${CMAKE_SOURCE_DIR}/plugins/Utils/unitymenumodelpaths.cpp

1717 ${CMAKE_SOURCE_DIR}/plugins/Utils/windowkeysfilter.cpp

1818 ${CMAKE_SOURCE_DIR}/plugins/Utils/easingcurve.cpp

19+ ${CMAKE_SOURCE_DIR}/plugins/Utils/inputwatcher.cpp

1920 windowstatestorage.cpp

2021 plugin.cpp

2122 )

tests/mocks/Utils/plugin.cpp+2

@@ -24,6 +24,7 @@

2424#include "plugin.h"

2525

2626// local

27+#include "inputwatcher.h"

2728#include "easingcurve.h"

2829#include "qlimitproxymodelqml.h"

2930#include "unitysortfilterproxymodelqml.h"

@@ -53,6 +54,7 @@ void FakeUtilsPlugin::registerTypes(const char *uri)

5354 qmlRegisterType<EasingCurve>(uri, 0, 1, "EasingCurve");

5455 qmlRegisterType<RelativeTimeFormatter>(uri, 0, 1, "RelativeTimeFormatter");

5556 qmlRegisterSingletonType<WindowStateStorage>(uri, 0, 1, "WindowStateStorage", createWindowStateStorage);

57+ qmlRegisterType<InputWatcher>(uri, 0, 1, "InputWatcher");

5658}

5759

5860void FakeUtilsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)