openkylin
/
gsettings-qt
mirror of https://gitee.com/openkylin/gsettings-qt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert upstream's decision to rename the DBus namespace. 

Forwarded: https://gitlab.com/ubports/core/gsettings-qt/issues/1

Gbp-Pq: Name 2001_keep-com.canonical-DBus-namespace.patch
This commit is contained in:
Mike Gabriel 2022-05-14 03:30:57 +08:00 committed by openKylinBot
parent 7c9f91afbf
commit 885a14e5af
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/com.ubports.gsettings.test.gschema.xml → tests/com.canonical.gsettings.test.gschema.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<schemalist> <schemalist>
<schema id="com.ubports.gsettings.Test" path="/com/ubports/gsettings/test/"> <schema id="com.canonical.gsettings.Test" path="/com/canonical/gsettings/test/">
<key name="test-integer" type="i"> <key name="test-integer" type="i">
<default>42</default> <default>42</default>
</key> </key>

2
tests/cpptest.cpp
View File

@ -15,7 +15,7 @@ private:
void TestDeferredDelete::initTestCase() void TestDeferredDelete::initTestCase()
{ {
settings = new QGSettings("com.ubports.gsettings.Test", QByteArray(), this); settings = new QGSettings("com.canonical.gsettings.Test", QByteArray(), this);
dummy = new QObject; dummy = new QObject;
connect(settings, &QGSettings::changed, dummy.data(), &QObject::deleteLater); // delete the dummy object upon any gsettings change connect(settings, &QGSettings::changed, dummy.data(), &QObject::deleteLater); // delete the dummy object upon any gsettings change
} }

2
tests/cpptest.pro
View File

@ -11,7 +11,7 @@ LIBS += -L$$(PWD)/../src -lgsettings-qt
schema.target = gschemas.compiled schema.target = gschemas.compiled
schema.commands = glib-compile-schemas $$PWD schema.commands = glib-compile-schemas $$PWD
schema.depends = com.ubports.gsettings.test.gschema.xml schema.depends = com.canonical.gsettings.test.gschema.xml
QMAKE_EXTRA_TARGETS += schema QMAKE_EXTRA_TARGETS += schema
PRE_TARGETDEPS = gschemas.compiled PRE_TARGETDEPS = gschemas.compiled

2
tests/tests.pro
View File

@ -9,7 +9,7 @@ SOURCES = test.cpp
schema.target = gschemas.compiled schema.target = gschemas.compiled
schema.commands = glib-compile-schemas $$PWD schema.commands = glib-compile-schemas $$PWD
schema.depends = com.ubports.gsettings.test.gschema.xml schema.depends = com.canonical.gsettings.test.gschema.xml
QMAKE_EXTRA_TARGETS += schema QMAKE_EXTRA_TARGETS += schema
PRE_TARGETDEPS = gschemas.compiled PRE_TARGETDEPS = gschemas.compiled

4
tests/tst_GSettings.qml
View File

@ -10,7 +10,7 @@ TestCase {
GSettings { GSettings {
id: settings id: settings
schema.id: "com.ubports.gsettings.Test" schema.id: "com.canonical.gsettings.Test"
// has to be "valueChanged" signal, not "changed"; the latter doesn't work reliably with the in-memory gsettings backend // has to be "valueChanged" signal, not "changed"; the latter doesn't work reliably with the in-memory gsettings backend
onValueChanged: testCase.changes.push([key, value]); onValueChanged: testCase.changes.push([key, value]);
} }
@ -24,7 +24,7 @@ TestCase {
GSettings { GSettings {
id: invalid_settings id: invalid_settings
schema.id: "com.ubports.gsettings.NonExisting" schema.id: "com.canonical.gsettings.NonExisting"
} }
property string bindingTest: settings.testString property string bindingTest: settings.testString