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>

6 files changed, 16 insertions, 16 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);
 }
diff --git a/tests/benchmarks/corelib/tools/qstring/fromlatin1.cpp b/tests/benchmarks/corelib/tools/qstring/fromlatin1.cpp
index 9a44b26505..660eb075b2 100644
--- a/tests/benchmarks/corelib/tools/qstring/fromlatin1.cpp
+++ b/tests/benchmarks/corelib/tools/qstring/fromlatin1.cpp
@@ -629,7 +629,7 @@ static const char charData[] __attribute__((aligned(64))) = {
 
     // #126
     "\377\376"
-        "Trolltech"
+        "QtProject"
     "\377\376\375\374\373" // 3328
 
     // #127
@@ -827,7 +827,7 @@ static const char charData[] __attribute__((aligned(64))) = {
     "\377\376\375\374\373\372\371\370\367\366\365\364\363\362\361\360" // 4544
 
     // #166
-        "Trolltech"
+        "QtProject"
     "\377\376\375\374\373\372\371" // 4560
 
     // #167
@@ -980,7 +980,7 @@ static const char charData[] __attribute__((aligned(64))) = {
     "\377\376\375\374\373" // 5488
 
     // #197
-        "Trolltech"
+        "QtProject"
     "\377\376\375\374\373\372\371" // 5504
 
     // #198
@@ -6955,7 +6955,7 @@ static const char charData[] __attribute__((aligned(64))) = {
     "\377\376\375" // 58688
 
     // #1425
-        "Trolltech"
+        "QtProject"
     "\377\376\375\374\373\372\371" // 58704
 
     // #1426
@@ -28453,7 +28453,7 @@ static const char charData[] __attribute__((aligned(64))) = {
     "\377\376" // 268688
 
     // #5853
-        "Trolltech"
+        "QtProject"
     "\377\376\375\374\373\372\371" // 268704
 
     // #5854
diff --git a/tests/manual/lance/widgets.h b/tests/manual/lance/widgets.h
index e5e21f4b35..a95658d215 100644
--- a/tests/manual/lance/widgets.h
+++ b/tests/manual/lance/widgets.h
@@ -99,7 +99,7 @@ public:
           m_filename(file),
           m_view_mode(RenderView)
     {
-        QSettings settings("Trolltech", "lance");
+        QSettings settings("QtProject", "lance");
         for (int i=0; i<10; ++i) {
             QPointF suggestion(100 + i * 40, 100 + 100 * qSin(i * 3.1415 / 10.0));
             m_controlPoints << settings.value("cp" + QString::number(i), suggestion).toPointF();
@@ -154,7 +154,7 @@ public:
 
     ~OnScreenWidget()
     {
-        QSettings settings("Trolltech", "lance");
+        QSettings settings("QtProject", "lance");
         for (int i=0; i<10; ++i) {
             settings.setValue("cp" + QString::number(i), m_controlPoints.at(i));
         }