a550870 · unity8 · git.iko.soy

on xenial help sign in

merge daniel's focus-fixing branch

a550870Michael Zanetti12 years ago

tests/mocks/Utils/CMakeLists.txt+1

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

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

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

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

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

19 windowstatestorage.cpp

20 windowstatestorage.cpp

20 plugin.cpp

21 plugin.cpp

21 )

22 )

tests/mocks/Utils/plugin.cpp+2

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

24#include "plugin.h"

26// local

27+#include "inputwatcher.h"

27#include "easingcurve.h"

28#include "easingcurve.h"

28#include "qlimitproxymodelqml.h"

29#include "qlimitproxymodelqml.h"

29#include "unitysortfilterproxymodelqml.h"

30#include "unitysortfilterproxymodelqml.h"

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

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

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

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

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

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

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

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

56}

58}

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

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