git.iko.soy/unity8
on xenial help sign in
Clean up code and make the fake virtual keyboard work again
cc896a5Daniel d'Andrada
tests/mocks/Unity/Application/MirSurface.h+1−1
compare with xenial
unifiedsplit
@@ -54,7 +54,7 @@ public:
54
54
55
55
56 Mir::State state() const override;
56 Mir::State state() const override;
57− void setState(Mir::State) override;
57+ Q_INVOKABLE void setState(Mir::State) override;
58
58
59 bool live() const override;
59 bool live() const override;
60
60
tests/mocks/Unity/Application/VirtualKeyboard.cpp−7
@@ -36,10 +36,3 @@ VirtualKeyboard::VirtualKeyboard()
36VirtualKeyboard::~VirtualKeyboard()
36VirtualKeyboard::~VirtualKeyboard()
37{
37{
38}
38}
39−
40−/*
41−void VirtualKeyboard::touchEvent(QTouchEvent *event)
42−{
43− event->setAccepted(false);
44−}
45−*/
tests/mocks/Unity/Application/VirtualKeyboard.h−5
@@ -27,11 +27,6 @@ class VirtualKeyboard : public MirSurface
27public:
27public:
28 explicit VirtualKeyboard();
28 explicit VirtualKeyboard();
29 ~VirtualKeyboard();
29 ~VirtualKeyboard();
30−
31−/*
32−protected:
33− void touchEvent(QTouchEvent * event) override;
34−*/
35};
30};
36
31
37Q_DECLARE_METATYPE(VirtualKeyboard*)
32Q_DECLARE_METATYPE(VirtualKeyboard*)