1
=== modified file 'qml/Components/InputMethod.qml'
2
--- qml/Components/InputMethod.qml	2015-12-02 10:34:31 +0000
3
+++ qml/Components/InputMethod.qml	2016-03-02 23:42:46 +0000
4
@@ -22,15 +22,6 @@
5
22
Item {
22
Item {
6
23
    id: root
23
    id: root
7
24
24
8
25
    Connections {
9
26
        target: SurfaceManager
10
27
        onSurfaceCreated: {
11
28
            if (surface.type == Mir.InputMethodType) {
12
29
                surfaceItem.surface = surface;
13
30
            }
14
31
        }
15
32
    }
16
33
17
34
    property int transitionDuration: UbuntuAnimation.FastDuration
25
    property int transitionDuration: UbuntuAnimation.FastDuration
18
35
26
19
36
    MirSurfaceItem {
27
    MirSurfaceItem {
20
@@ -41,6 +32,7 @@
21
41
32
22
42
        surfaceWidth: width
33
        surfaceWidth: width
23
43
        surfaceHeight: height
34
        surfaceHeight: height
24
35
        surface: SurfaceManager.inputMethodSurface
25
44
36
26
45
        onLiveChanged: {
37
        onLiveChanged: {
27
46
            if (surface !== null && !live) {
38
            if (surface !== null && !live) {
28
47
39
29
=== modified file 'tests/mocks/Unity/Application/MirSurface.cpp'
30
--- tests/mocks/Unity/Application/MirSurface.cpp	2015-11-30 18:25:47 +0000
31
+++ tests/mocks/Unity/Application/MirSurface.cpp	2016-03-02 23:42:46 +0000
32
@@ -22,8 +22,9 @@
33
22
        Mir::Type type,
22
        Mir::Type type,
34
23
        Mir::State state,
23
        Mir::State state,
35
24
        const QUrl& screenshot,
24
        const QUrl& screenshot,
38
25
        const QUrl &qmlFilePath)
25
        const QUrl &qmlFilePath,
39
26
    : unity::shell::application::MirSurfaceInterface(nullptr)
26
        QObject *parent)
40
27
    : unity::shell::application::MirSurfaceInterface(parent)
41
27
    , m_name(name)
28
    , m_name(name)
42
28
    , m_type(type)
29
    , m_type(type)
43
29
    , m_state(state)
30
    , m_state(state)
44
30
31
45
=== modified file 'tests/mocks/Unity/Application/MirSurface.h'
46
--- tests/mocks/Unity/Application/MirSurface.h	2015-11-30 18:25:47 +0000
47
+++ tests/mocks/Unity/Application/MirSurface.h	2016-03-02 23:42:46 +0000
48
@@ -41,7 +41,8 @@
49
41
            Mir::Type type,
41
            Mir::Type type,
50
42
            Mir::State state,
42
            Mir::State state,
51
43
            const QUrl& screenshot,
43
            const QUrl& screenshot,
53
44
            const QUrl &qmlFilePath = QUrl());
44
            const QUrl &qmlFilePath = QUrl(),
54
45
            QObject *parent = nullptr);
55
45
    virtual ~MirSurface();
46
    virtual ~MirSurface();
56
46
47
57
47
    ////
48
    ////
58
48
49
59
=== modified file 'tests/mocks/Unity/Application/SurfaceManager.cpp'
60
--- tests/mocks/Unity/Application/SurfaceManager.cpp	2015-11-30 18:25:47 +0000
61
+++ tests/mocks/Unity/Application/SurfaceManager.cpp	2016-03-02 23:42:46 +0000
62
@@ -34,6 +34,13 @@
63
34
    QObject(parent)
34
    QObject(parent)
64
35
    , m_virtualKeyboard(nullptr)
35
    , m_virtualKeyboard(nullptr)
65
36
{
36
{
66
37
    m_virtualKeyboard = new VirtualKeyboard(this);
67
38
    connect(m_virtualKeyboard, &QObject::destroyed, this, [this](QObject *obj) {
68
39
        MirSurface* surface = qobject_cast<MirSurface*>(obj);
69
40
        m_virtualKeyboard = nullptr;
70
41
        Q_EMIT inputMethodSurfaceChanged();
71
42
        Q_EMIT surfaceDestroyed(surface);
72
43
    });
73
37
}
44
}
74
38
45
75
39
MirSurface *SurfaceManager::createSurface(const QString& name,
46
MirSurface *SurfaceManager::createSurface(const QString& name,
76
@@ -58,16 +65,8 @@
77
58
    return surface;
65
    return surface;
78
59
}
66
}
79
60
67
81
61
MirSurface *SurfaceManager::inputMethodSurface()
68
MirSurface *SurfaceManager::inputMethodSurface() const
82
62
{
69
{
83
63
    if (!m_virtualKeyboard) {
84
64
        m_virtualKeyboard = new VirtualKeyboard;
85
65
        connect(m_virtualKeyboard, &QObject::destroyed, this, [this](QObject *obj) {
86
66
            MirSurface* surface = qobject_cast<MirSurface*>(obj);
87
67
            Q_EMIT surfaceDestroyed(surface);
88
68
        });
89
69
        Q_EMIT surfaceCreated(m_virtualKeyboard);
90
70
    }
91
71
    return m_virtualKeyboard;
70
    return m_virtualKeyboard;
92
72
}
71
}
93
73
72
94
74
73
95
=== modified file 'tests/mocks/Unity/Application/SurfaceManager.h'
96
--- tests/mocks/Unity/Application/SurfaceManager.h	2015-11-30 18:25:47 +0000
97
+++ tests/mocks/Unity/Application/SurfaceManager.h	2016-03-02 23:42:46 +0000
98
@@ -25,7 +25,7 @@
99
25
class SurfaceManager : public QObject
25
class SurfaceManager : public QObject
100
26
{
26
{
101
27
    Q_OBJECT
27
    Q_OBJECT
103
28
28
    Q_PROPERTY(MirSurface* inputMethodSurface READ inputMethodSurface NOTIFY inputMethodSurfaceChanged)
104
29
    Q_PROPERTY(int newSurfaceMinimumWidth READ newSurfaceMinimumWidth WRITE setNewSurfaceMinimumWidth NOTIFY newSurfaceMinimumWidthChanged)
29
    Q_PROPERTY(int newSurfaceMinimumWidth READ newSurfaceMinimumWidth WRITE setNewSurfaceMinimumWidth NOTIFY newSurfaceMinimumWidthChanged)
105
30
    Q_PROPERTY(int newSurfaceMaximumWidth READ newSurfaceMaximumWidth WRITE setNewSurfaceMaximumWidth NOTIFY newSurfaceMaximumWidthChanged)
30
    Q_PROPERTY(int newSurfaceMaximumWidth READ newSurfaceMaximumWidth WRITE setNewSurfaceMaximumWidth NOTIFY newSurfaceMaximumWidthChanged)
106
31
    Q_PROPERTY(int newSurfaceMinimumHeight READ newSurfaceMinimumHeight WRITE setNewSurfaceMinimumHeight NOTIFY newSurfaceMinimumHeightChanged)
31
    Q_PROPERTY(int newSurfaceMinimumHeight READ newSurfaceMinimumHeight WRITE setNewSurfaceMinimumHeight NOTIFY newSurfaceMinimumHeightChanged)
107
@@ -43,8 +43,7 @@
108
43
                                  Mir::State state,
43
                                  Mir::State state,
109
44
                                  const QUrl& screenshot);
44
                                  const QUrl& screenshot);
110
45
45
113
46
    // To be used in the tests
46
    MirSurface* inputMethodSurface() const;
112
47
    Q_INVOKABLE MirSurface* inputMethodSurface();
114
48
47
115
49
    int newSurfaceMinimumWidth() const { return m_newSurfaceMinimumWidth; }
48
    int newSurfaceMinimumWidth() const { return m_newSurfaceMinimumWidth; }
116
50
    void setNewSurfaceMinimumWidth(int value);
49
    void setNewSurfaceMinimumWidth(int value);
117
@@ -65,6 +64,7 @@
118
65
    void setNewSurfaceHeightIncrement(int);
64
    void setNewSurfaceHeightIncrement(int);
119
66
65
120
67
Q_SIGNALS:
66
Q_SIGNALS:
121
67
    void inputMethodSurfaceChanged();
122
68
    void countChanged();
68
    void countChanged();
123
69
    void surfaceCreated(MirSurface *surface);
69
    void surfaceCreated(MirSurface *surface);
124
70
    void surfaceDestroyed(MirSurface*surface);
70
    void surfaceDestroyed(MirSurface*surface);
125
71
71
126
=== modified file 'tests/mocks/Unity/Application/VirtualKeyboard.cpp'
127
--- tests/mocks/Unity/Application/VirtualKeyboard.cpp	2015-09-02 10:35:16 +0000
128
+++ tests/mocks/Unity/Application/VirtualKeyboard.cpp	2016-03-02 23:42:46 +0000
129
@@ -22,12 +22,13 @@
130
22
22
131
23
#include <QDebug>
23
#include <QDebug>
132
24
24
134
25
VirtualKeyboard::VirtualKeyboard()
25
VirtualKeyboard::VirtualKeyboard(QObject *parent)
135
26
    : MirSurface("input-method",
26
    : MirSurface("input-method",
136
27
                     Mir::InputMethodType,
27
                     Mir::InputMethodType,
137
28
                     Mir::MinimizedState,
28
                     Mir::MinimizedState,
138
29
                     QUrl("qrc:///Unity/Application/vkb_portrait.png"),
29
                     QUrl("qrc:///Unity/Application/vkb_portrait.png"),
140
30
                     QUrl("qrc:///Unity/Application/VirtualKeyboard.qml"))
30
                     QUrl("qrc:///Unity/Application/VirtualKeyboard.qml"),
141
31
                     parent)
142
31
{
32
{
143
32
}
33
}
144
33
34
145
34
35
146
=== modified file 'tests/mocks/Unity/Application/VirtualKeyboard.h'
147
--- tests/mocks/Unity/Application/VirtualKeyboard.h	2015-08-19 20:30:09 +0000
148
+++ tests/mocks/Unity/Application/VirtualKeyboard.h	2016-03-02 23:42:46 +0000
149
@@ -25,7 +25,7 @@
150
25
{
25
{
151
26
    Q_OBJECT
26
    Q_OBJECT
152
27
public:
27
public:
154
28
    explicit VirtualKeyboard();
28
    explicit VirtualKeyboard(QObject *parent = nullptr);
155
29
    ~VirtualKeyboard();
29
    ~VirtualKeyboard();
156
30
};
30
};
157
31
31
158
32
32
159
=== modified file 'tests/mocks/Unity/Application/plugin.cpp'
160
--- tests/mocks/Unity/Application/plugin.cpp	2015-08-03 15:00:47 +0000
161
+++ tests/mocks/Unity/Application/plugin.cpp	2016-03-02 23:42:46 +0000
162
@@ -78,8 +78,9 @@
163
78
    qmlRegisterUncreatableType<unity::shell::application::ApplicationInfoInterface>(uri, 0, 1, "ApplicationInfoInterface", "Abstract interface. Cannot be created in QML");
78
    qmlRegisterUncreatableType<unity::shell::application::ApplicationInfoInterface>(uri, 0, 1, "ApplicationInfoInterface", "Abstract interface. Cannot be created in QML");
164
79
    qmlRegisterUncreatableType<Session>(uri, 0, 1, "Session", "Session can't be instantiated from QML");
79
    qmlRegisterUncreatableType<Session>(uri, 0, 1, "Session", "Session can't be instantiated from QML");
165
80
    qmlRegisterUncreatableType<MirSurface>(uri, 0, 1, "MirSurface", "MirSurface can't be instantiated from QML");
80
    qmlRegisterUncreatableType<MirSurface>(uri, 0, 1, "MirSurface", "MirSurface can't be instantiated from QML");
166
81
    qmlRegisterUncreatableType<unity::shell::application::MirSurfaceInterface>(
167
82
                    uri, 0, 1, "MirSurface", "MirSurface can't be instantiated from QML");
168
81
    qmlRegisterType<MirSurfaceItem>(uri, 0, 1, "MirSurfaceItem");
83
    qmlRegisterType<MirSurfaceItem>(uri, 0, 1, "MirSurfaceItem");
169
82
170
83
    qmlRegisterType<ApplicationInfo>(uri, 0, 1, "ApplicationInfo");
84
    qmlRegisterType<ApplicationInfo>(uri, 0, 1, "ApplicationInfo");
171
84
85
172
85
    qmlRegisterSingletonType<ApplicationManager>(uri, 0, 1, "ApplicationManager", applicationManagerSingleton);
86
    qmlRegisterSingletonType<ApplicationManager>(uri, 0, 1, "ApplicationManager", applicationManagerSingleton);
173
86
87
174
=== modified file 'tests/qmltests/tst_OrientedShell.qml'
175
--- tests/qmltests/tst_OrientedShell.qml	2016-01-28 11:31:48 +0000
176
+++ tests/qmltests/tst_OrientedShell.qml	2016-03-02 23:42:46 +0000
177
@@ -314,7 +314,7 @@
178
314
                    checked: false
314
                    checked: false
179
315
                    activeFocusOnPress: false
315
                    activeFocusOnPress: false
180
316
                    onCheckedChanged: {
316
                    onCheckedChanged: {
182
317
                        var surface = SurfaceManager.inputMethodSurface();
317
                        var surface = SurfaceManager.inputMethodSurface;
183
318
                        if (checked) {
318
                        if (checked) {
184
319
                            surface.setState(Mir.RestoredState);
319
                            surface.setState(Mir.RestoredState);
185
320
                        } else {
320
                        } else {
186
321
321
187
=== modified file 'tests/qmltests/tst_Shell.qml'
188
--- tests/qmltests/tst_Shell.qml	2016-02-12 00:11:28 +0000
189
+++ tests/qmltests/tst_Shell.qml	2016-03-02 23:42:46 +0000
190
@@ -773,7 +773,7 @@
191
773
            loadShell("phone");
773
            loadShell("phone");
192
774
            swipeAwayGreeter();
774
            swipeAwayGreeter();
193
775
            var item = findChild(shell, "inputMethod");
775
            var item = findChild(shell, "inputMethod");
195
776
            var surface = SurfaceManager.inputMethodSurface();
776
            var surface = SurfaceManager.inputMethodSurface;
196
777
777
197
778
            surface.setState(Mir.MinimizedState);
778
            surface.setState(Mir.MinimizedState);
198
779
            tryCompare(item, "visible", false);
779
            tryCompare(item, "visible", false);
Reviewer	Review Type	Date Requested	Status
Michał Sawicz	ci		Approve on 2016-03-09
Unity8 CI Bot	continuous-integration		Approve on 2016-03-03
Lukáš Tinkl (community)			Approve on 2016-02-17
Daniel d'Andrada (community)		2016-02-15	Approve on 2016-02-17
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2016-02-16
Review via email: mp+286076@code.launchpad.net
1	=== modified file 'qml/Components/InputMethod.qml'
2	--- qml/Components/InputMethod.qml 2015-12-02 10:34:31 +0000
3	+++ qml/Components/InputMethod.qml 2016-03-02 23:42:46 +0000
4	@@ -22,15 +22,6 @@
5	22	Item {	22	Item {
6	23	id: root	23	id: root
7	24		24
8	25	Connections {
9	26	target: SurfaceManager
10	27	onSurfaceCreated: {
11	28	if (surface.type == Mir.InputMethodType) {
12	29	surfaceItem.surface = surface;
13	30	}
14	31	}
15	32	}
16	33
17	34	property int transitionDuration: UbuntuAnimation.FastDuration	25	property int transitionDuration: UbuntuAnimation.FastDuration
18	35		26
19	36	MirSurfaceItem {	27	MirSurfaceItem {
20	@@ -41,6 +32,7 @@
21	41		32
22	42	surfaceWidth: width	33	surfaceWidth: width
23	43	surfaceHeight: height	34	surfaceHeight: height
24			35	surface: SurfaceManager.inputMethodSurface
25	44		36
26	45	onLiveChanged: {	37	onLiveChanged: {
27	46	if (surface !== null && !live) {	38	if (surface !== null && !live) {
28	47		39
29	=== modified file 'tests/mocks/Unity/Application/MirSurface.cpp'
30	--- tests/mocks/Unity/Application/MirSurface.cpp 2015-11-30 18:25:47 +0000
31	+++ tests/mocks/Unity/Application/MirSurface.cpp 2016-03-02 23:42:46 +0000
32	@@ -22,8 +22,9 @@
33	22	Mir::Type type,	22	Mir::Type type,
34	23	Mir::State state,	23	Mir::State state,
35	24	const QUrl& screenshot,	24	const QUrl& screenshot,
38	25	const QUrl &qmlFilePath)	25	const QUrl &qmlFilePath,
39	26	: unity::shell::application::MirSurfaceInterface(nullptr)	26	QObject *parent)
40			27	: unity::shell::application::MirSurfaceInterface(parent)
41	27	, m_name(name)	28	, m_name(name)
42	28	, m_type(type)	29	, m_type(type)
43	29	, m_state(state)	30	, m_state(state)
44	30		31
45	=== modified file 'tests/mocks/Unity/Application/MirSurface.h'
46	--- tests/mocks/Unity/Application/MirSurface.h 2015-11-30 18:25:47 +0000
47	+++ tests/mocks/Unity/Application/MirSurface.h 2016-03-02 23:42:46 +0000
48	@@ -41,7 +41,8 @@
49	41	Mir::Type type,	41	Mir::Type type,
50	42	Mir::State state,	42	Mir::State state,
51	43	const QUrl& screenshot,	43	const QUrl& screenshot,
53	44	const QUrl &qmlFilePath = QUrl());	44	const QUrl &qmlFilePath = QUrl(),
54			45	QObject *parent = nullptr);
55	45	virtual ~MirSurface();	46	virtual ~MirSurface();
56	46		47
57	47	////	48	////
58	48		49
59	=== modified file 'tests/mocks/Unity/Application/SurfaceManager.cpp'
60	--- tests/mocks/Unity/Application/SurfaceManager.cpp 2015-11-30 18:25:47 +0000
61	+++ tests/mocks/Unity/Application/SurfaceManager.cpp 2016-03-02 23:42:46 +0000
62	@@ -34,6 +34,13 @@
63	34	QObject(parent)	34	QObject(parent)
64	35	, m_virtualKeyboard(nullptr)	35	, m_virtualKeyboard(nullptr)
65	36	{	36	{
66			37	m_virtualKeyboard = new VirtualKeyboard(this);
67			38	connect(m_virtualKeyboard, &QObject::destroyed, this, [this](QObject *obj) {
68			39	MirSurface* surface = qobject_cast<MirSurface*>(obj);
69			40	m_virtualKeyboard = nullptr;
70			41	Q_EMIT inputMethodSurfaceChanged();
71			42	Q_EMIT surfaceDestroyed(surface);
72			43	});
73	37	}	44	}
74	38		45
75	39	MirSurface *SurfaceManager::createSurface(const QString& name,	46	MirSurface *SurfaceManager::createSurface(const QString& name,
76	@@ -58,16 +65,8 @@
77	58	return surface;	65	return surface;
78	59	}	66	}
79	60		67
81	61	MirSurface *SurfaceManager::inputMethodSurface()	68	MirSurface *SurfaceManager::inputMethodSurface() const
82	62	{	69	{
83	63	if (!m_virtualKeyboard) {
84	64	m_virtualKeyboard = new VirtualKeyboard;
85	65	connect(m_virtualKeyboard, &QObject::destroyed, this, [this](QObject *obj) {
86	66	MirSurface* surface = qobject_cast<MirSurface*>(obj);
87	67	Q_EMIT surfaceDestroyed(surface);
88	68	});
89	69	Q_EMIT surfaceCreated(m_virtualKeyboard);
90	70	}
91	71	return m_virtualKeyboard;	70	return m_virtualKeyboard;
92	72	}	71	}
93	73		72
94	74		73
95	=== modified file 'tests/mocks/Unity/Application/SurfaceManager.h'
96	--- tests/mocks/Unity/Application/SurfaceManager.h 2015-11-30 18:25:47 +0000
97	+++ tests/mocks/Unity/Application/SurfaceManager.h 2016-03-02 23:42:46 +0000
98	@@ -25,7 +25,7 @@
99	25	class SurfaceManager : public QObject	25	class SurfaceManager : public QObject
100	26	{	26	{
101	27	Q_OBJECT	27	Q_OBJECT
103	28		28	Q_PROPERTY(MirSurface* inputMethodSurface READ inputMethodSurface NOTIFY inputMethodSurfaceChanged)
104	29	Q_PROPERTY(int newSurfaceMinimumWidth READ newSurfaceMinimumWidth WRITE setNewSurfaceMinimumWidth NOTIFY newSurfaceMinimumWidthChanged)	29	Q_PROPERTY(int newSurfaceMinimumWidth READ newSurfaceMinimumWidth WRITE setNewSurfaceMinimumWidth NOTIFY newSurfaceMinimumWidthChanged)
105	30	Q_PROPERTY(int newSurfaceMaximumWidth READ newSurfaceMaximumWidth WRITE setNewSurfaceMaximumWidth NOTIFY newSurfaceMaximumWidthChanged)	30	Q_PROPERTY(int newSurfaceMaximumWidth READ newSurfaceMaximumWidth WRITE setNewSurfaceMaximumWidth NOTIFY newSurfaceMaximumWidthChanged)
106	31	Q_PROPERTY(int newSurfaceMinimumHeight READ newSurfaceMinimumHeight WRITE setNewSurfaceMinimumHeight NOTIFY newSurfaceMinimumHeightChanged)	31	Q_PROPERTY(int newSurfaceMinimumHeight READ newSurfaceMinimumHeight WRITE setNewSurfaceMinimumHeight NOTIFY newSurfaceMinimumHeightChanged)
107	@@ -43,8 +43,7 @@
108	43	Mir::State state,	43	Mir::State state,
109	44	const QUrl& screenshot);	44	const QUrl& screenshot);
110	45		45
113	46	// To be used in the tests	46	MirSurface* inputMethodSurface() const;
112	47	Q_INVOKABLE MirSurface* inputMethodSurface();
114	48		47
115	49	int newSurfaceMinimumWidth() const { return m_newSurfaceMinimumWidth; }	48	int newSurfaceMinimumWidth() const { return m_newSurfaceMinimumWidth; }
116	50	void setNewSurfaceMinimumWidth(int value);	49	void setNewSurfaceMinimumWidth(int value);
117	@@ -65,6 +64,7 @@
118	65	void setNewSurfaceHeightIncrement(int);	64	void setNewSurfaceHeightIncrement(int);
119	66		65
120	67	Q_SIGNALS:	66	Q_SIGNALS:
121			67	void inputMethodSurfaceChanged();
122	68	void countChanged();	68	void countChanged();
123	69	void surfaceCreated(MirSurface *surface);	69	void surfaceCreated(MirSurface *surface);
124	70	void surfaceDestroyed(MirSurface*surface);	70	void surfaceDestroyed(MirSurface*surface);
125	71		71
126	=== modified file 'tests/mocks/Unity/Application/VirtualKeyboard.cpp'
127	--- tests/mocks/Unity/Application/VirtualKeyboard.cpp 2015-09-02 10:35:16 +0000
128	+++ tests/mocks/Unity/Application/VirtualKeyboard.cpp 2016-03-02 23:42:46 +0000
129	@@ -22,12 +22,13 @@
130	22		22
131	23	#include <QDebug>	23	#include <QDebug>
132	24		24
134	25	VirtualKeyboard::VirtualKeyboard()	25	VirtualKeyboard::VirtualKeyboard(QObject *parent)
135	26	: MirSurface("input-method",	26	: MirSurface("input-method",
136	27	Mir::InputMethodType,	27	Mir::InputMethodType,
137	28	Mir::MinimizedState,	28	Mir::MinimizedState,
138	29	QUrl("qrc:///Unity/Application/vkb_portrait.png"),	29	QUrl("qrc:///Unity/Application/vkb_portrait.png"),
140	30	QUrl("qrc:///Unity/Application/VirtualKeyboard.qml"))	30	QUrl("qrc:///Unity/Application/VirtualKeyboard.qml"),
141			31	parent)
142	31	{	32	{
143	32	}	33	}
144	33		34
145	34		35
146	=== modified file 'tests/mocks/Unity/Application/VirtualKeyboard.h'
147	--- tests/mocks/Unity/Application/VirtualKeyboard.h 2015-08-19 20:30:09 +0000
148	+++ tests/mocks/Unity/Application/VirtualKeyboard.h 2016-03-02 23:42:46 +0000
149	@@ -25,7 +25,7 @@
150	25	{	25	{
151	26	Q_OBJECT	26	Q_OBJECT
152	27	public:	27	public:
154	28	explicit VirtualKeyboard();	28	explicit VirtualKeyboard(QObject *parent = nullptr);
155	29	~VirtualKeyboard();	29	~VirtualKeyboard();
156	30	};	30	};
157	31		31
158	32		32
159	=== modified file 'tests/mocks/Unity/Application/plugin.cpp'
160	--- tests/mocks/Unity/Application/plugin.cpp 2015-08-03 15:00:47 +0000
161	+++ tests/mocks/Unity/Application/plugin.cpp 2016-03-02 23:42:46 +0000
162	@@ -78,8 +78,9 @@
163	78	qmlRegisterUncreatableType<unity::shell::application::ApplicationInfoInterface>(uri, 0, 1, "ApplicationInfoInterface", "Abstract interface. Cannot be created in QML");	78	qmlRegisterUncreatableType<unity::shell::application::ApplicationInfoInterface>(uri, 0, 1, "ApplicationInfoInterface", "Abstract interface. Cannot be created in QML");
164	79	qmlRegisterUncreatableType<Session>(uri, 0, 1, "Session", "Session can't be instantiated from QML");	79	qmlRegisterUncreatableType<Session>(uri, 0, 1, "Session", "Session can't be instantiated from QML");
165	80	qmlRegisterUncreatableType<MirSurface>(uri, 0, 1, "MirSurface", "MirSurface can't be instantiated from QML");	80	qmlRegisterUncreatableType<MirSurface>(uri, 0, 1, "MirSurface", "MirSurface can't be instantiated from QML");
166			81	qmlRegisterUncreatableType<unity::shell::application::MirSurfaceInterface>(
167			82	uri, 0, 1, "MirSurface", "MirSurface can't be instantiated from QML");
168	81	qmlRegisterType<MirSurfaceItem>(uri, 0, 1, "MirSurfaceItem");	83	qmlRegisterType<MirSurfaceItem>(uri, 0, 1, "MirSurfaceItem");
169	82
170	83	qmlRegisterType<ApplicationInfo>(uri, 0, 1, "ApplicationInfo");	84	qmlRegisterType<ApplicationInfo>(uri, 0, 1, "ApplicationInfo");
171	84		85
172	85	qmlRegisterSingletonType<ApplicationManager>(uri, 0, 1, "ApplicationManager", applicationManagerSingleton);	86	qmlRegisterSingletonType<ApplicationManager>(uri, 0, 1, "ApplicationManager", applicationManagerSingleton);
173	86		87
174	=== modified file 'tests/qmltests/tst_OrientedShell.qml'
175	--- tests/qmltests/tst_OrientedShell.qml 2016-01-28 11:31:48 +0000
176	+++ tests/qmltests/tst_OrientedShell.qml 2016-03-02 23:42:46 +0000
177	@@ -314,7 +314,7 @@
178	314	checked: false	314	checked: false
179	315	activeFocusOnPress: false	315	activeFocusOnPress: false
180	316	onCheckedChanged: {	316	onCheckedChanged: {
182	317	var surface = SurfaceManager.inputMethodSurface();	317	var surface = SurfaceManager.inputMethodSurface;
183	318	if (checked) {	318	if (checked) {
184	319	surface.setState(Mir.RestoredState);	319	surface.setState(Mir.RestoredState);
185	320	} else {	320	} else {
186	321		321
187	=== modified file 'tests/qmltests/tst_Shell.qml'
188	--- tests/qmltests/tst_Shell.qml 2016-02-12 00:11:28 +0000
189	+++ tests/qmltests/tst_Shell.qml 2016-03-02 23:42:46 +0000
190	@@ -773,7 +773,7 @@
191	773	loadShell("phone");	773	loadShell("phone");
192	774	swipeAwayGreeter();	774	swipeAwayGreeter();
193	775	var item = findChild(shell, "inputMethod");	775	var item = findChild(shell, "inputMethod");
195	776	var surface = SurfaceManager.inputMethodSurface();	776	var surface = SurfaceManager.inputMethodSurface;
196	777		777
197	778	surface.setState(Mir.MinimizedState);	778	surface.setState(Mir.MinimizedState);
198	779	tryCompare(item, "visible", false);	779	tryCompare(item, "visible", false);