summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/io/qsettings
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@digia.com>2012-12-02 17:24:19 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-12-03 03:47:08 +0100
commit0df026de86a885a7b0acb9138edab14db31d63f7 (patch)
treea440d39d391be75826554d039e610dd6b8b4b8ed /tests/auto/corelib/io/qsettings
parent0d40958347ad0b60fb1ccd15ab7a59e1407e945d (diff)
Stop using the name "Trolltech" in QSettings
Also change Trolltech for QtProject in other places Task-number: QTBUG-23269 Change-Id: Ie4e344f23cab77c575562d18b481b3369ce30491 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'tests/auto/corelib/io/qsettings')
-rw-r--r--tests/auto/corelib/io/qsettings/tst_qsettings.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
index b975474c8f..40208f6e6d 100644
--- a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
+++ b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
@@ -650,12 +650,12 @@ void tst_QSettings::testByteArray()
// write
{
- QSettings settings("Trolltech", "tst_qsettings");
+ QSettings settings("QtProject", "tst_qsettings");
settings.setValue("byteArray", data);
}
// read
{
- QSettings settings("Trolltech", "tst_qsettings");
+ QSettings settings("QtProject", "tst_qsettings");
QByteArray ret = settings.value("byteArray", data).toByteArray();
QCOMPARE(ret, data);
}
@@ -1896,7 +1896,7 @@ void tst_QSettings::testEmptyData()
}
{
- QSettings settings("Trolltech", "tst_qsettings");
+ QSettings settings("QtProject", "tst_qsettings");
settings.setValue("nullString", nullString);
settings.setValue("emptyString", emptyString);
settings.setValue("emptyList", emptyList);
@@ -1909,7 +1909,7 @@ void tst_QSettings::testEmptyData()
QVERIFY(settings.status() == QSettings::NoError);
}
{
- QSettings settings("Trolltech", "tst_qsettings");
+ QSettings settings("QtProject", "tst_qsettings");
QCOMPARE(settings.value("nullString").toString(), nullString);
QCOMPARE(settings.value("emptyString").toString(), emptyString);
QCOMPARE(settings.value("emptyList").toStringList(), emptyList);