diff options
Diffstat (limited to 'tests/auto')
4 files changed, 9 insertions, 9 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); diff --git a/tests/auto/network/access/qabstractnetworkcache/tst_qabstractnetworkcache.cpp b/tests/auto/network/access/qabstractnetworkcache/tst_qabstractnetworkcache.cpp index 76c047a076..1b53eabdde 100644 --- a/tests/auto/network/access/qabstractnetworkcache/tst_qabstractnetworkcache.cpp +++ b/tests/auto/network/access/qabstractnetworkcache/tst_qabstractnetworkcache.cpp @@ -121,7 +121,7 @@ public: tst_QAbstractNetworkCache::tst_QAbstractNetworkCache() { - QCoreApplication::setOrganizationName(QLatin1String("Trolltech")); + QCoreApplication::setOrganizationName(QLatin1String("QtProject")); QCoreApplication::setApplicationName(QLatin1String("autotest_qabstractnetworkcache")); QCoreApplication::setApplicationVersion(QLatin1String("1.0")); } diff --git a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp index 8ce0742854..952f5eaeea 100644 --- a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp +++ b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp @@ -166,7 +166,7 @@ tst_QFiledialog::~tst_QFiledialog() void tst_QFiledialog::init() { // Save the developers settings so they don't get mad when their sidebar folders are gone. - QSettings settings(QSettings::UserScope, QLatin1String("Trolltech")); + QSettings settings(QSettings::UserScope, QLatin1String("QtProject")); settings.beginGroup(QLatin1String("Qt")); userSettings = settings.value(QLatin1String("filedialog")).toByteArray(); settings.remove(QLatin1String("filedialog")); @@ -180,7 +180,7 @@ void tst_QFiledialog::init() void tst_QFiledialog::cleanup() { - QSettings settings(QSettings::UserScope, QLatin1String("Trolltech")); + QSettings settings(QSettings::UserScope, QLatin1String("QtProject")); settings.beginGroup(QLatin1String("Qt")); settings.setValue(QLatin1String("filedialog"), userSettings); } diff --git a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp index 6b0888f68a..b0c48a6558 100644 --- a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp +++ b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp @@ -165,7 +165,7 @@ void tst_QFileDialog2::init() QVERIFY(tempDir.isValid()); // Save the developers settings so they don't get mad when their sidebar folders are gone. - QSettings settings(QSettings::UserScope, QLatin1String("Trolltech")); + QSettings settings(QSettings::UserScope, QLatin1String("QtProject")); settings.beginGroup(QLatin1String("Qt")); userSettings = settings.value(QLatin1String("filedialog")).toByteArray(); settings.remove(QLatin1String("filedialog")); @@ -179,7 +179,7 @@ void tst_QFileDialog2::init() void tst_QFileDialog2::cleanup() { - QSettings settings(QSettings::UserScope, QLatin1String("Trolltech")); + QSettings settings(QSettings::UserScope, QLatin1String("QtProject")); settings.beginGroup(QLatin1String("Qt")); settings.setValue(QLatin1String("filedialog"), userSettings); } |