on xenial help sign in
Emit signals when gsettings is ready
0093b89Michael Terry
tests/mocks/GSettings.1.0/fake_gsettings.cpp+7
@@ -174,6 +174,13 @@ void GSettingsQml::componentComplete()
174 this, &GSettingsQml::autohideLauncherChanged);
174 this, &GSettingsQml::autohideLauncherChanged);
175 connect(GSettingsControllerQml::instance(), &GSettingsControllerQml::launcherWidthChanged,
175 connect(GSettingsControllerQml::instance(), &GSettingsControllerQml::launcherWidthChanged,
176 this, &GSettingsQml::launcherWidthChanged);
176 this, &GSettingsQml::launcherWidthChanged);
177+
178+ Q_EMIT pictureUriChanged();
179+ Q_EMIT usageModeChanged();
180+ Q_EMIT lockedOutTimeChanged();
181+ Q_EMIT lifecycleExemptAppidsChanged();
182+ Q_EMIT autohideLauncherChanged();
183+ Q_EMIT launcherWidthChanged();
177}
184}
178
185
179GSettingsSchemaQml * GSettingsQml::schema() const {
186GSettingsSchemaQml * GSettingsQml::schema() const {
tests/mocks/GSettings.1.0/fake_gsettings.h+6−6
@@ -79,12 +79,12 @@ public:
79
79
80Q_SIGNALS:
80Q_SIGNALS:
81 void schemaChanged();
81 void schemaChanged();
82− void pictureUriChanged(const QString&);
82+ void pictureUriChanged();
83− void usageModeChanged(const QString&);
83+ void usageModeChanged();
84− void lockedOutTimeChanged(qint64);
84+ void lockedOutTimeChanged();
85− void lifecycleExemptAppidsChanged(const QStringList &);
85+ void lifecycleExemptAppidsChanged();
86− void autohideLauncherChanged(bool);
86+ void autohideLauncherChanged();
87− void launcherWidthChanged(int launcherWidth);
87+ void launcherWidthChanged();
88
88
89private:
89private:
90 GSettingsSchemaQml* m_schema;
90 GSettingsSchemaQml* m_schema;
tests/qmltests/tst_OrientedShell.qml+7
@@ -471,6 +471,13 @@ Rectangle {
471 // kill all (fake) running apps
471 // kill all (fake) running apps
472 killApps();
472 killApps();
473
473
474+ while (miceModel.count > 0)
475+ MockInputDeviceBackend.removeDevice("/mouse" + (miceModel.count - 1));
476+ while (touchpadModel.count > 0)
477+ MockInputDeviceBackend.removeDevice("/touchpad" + (touchpadModel.count - 1));
478+ while (keyboardsModel.count > 0)
479+ MockInputDeviceBackend.removeDevice("/kbd" + (keyboardsModel.count - 1))
480+
474 spreadRepeaterConnections.target = null;
481 spreadRepeaterConnections.target = null;
475 spreadRepeaterConnections.itemAddedCallback = null;
482 spreadRepeaterConnections.itemAddedCallback = null;
476 signalSpy.target = null;
483 signalSpy.target = null;