Use "QtProject" as organization name in various tools.

Change-Id: I00f896d36cba4024562703d5b808bea35a0d4008
Reviewed-by: hjk <qthjk@ovi.com>

diff --git a/src/linguist/linguist/main.cpp b/src/linguist/linguist/main.cpp
index 35ff632..318d1ac 100644 (file)
--- a/src/linguist/linguist/main.cpp
+++ b/src/linguist/linguist/main.cpp
@@ -142,7 +142,7 @@ int main(int argc, char **argv)
             app.removeTranslator(&translator);
     }
 
-    app.setOrganizationName(QLatin1String("Trolltech"));
+    app.setOrganizationName(QLatin1String("QtProject"));
     app.setApplicationName(QLatin1String("Linguist"));
 
     QSettings config;

diff --git a/src/makeqpf/main.cpp b/src/makeqpf/main.cpp
index 36e3570..c6515c5 100644 (file)
--- a/src/makeqpf/main.cpp
+++ b/src/makeqpf/main.cpp
@@ -70,7 +70,7 @@ int main(int argc, char **argv)
     QT_USE_NAMESPACE
 
     QApplication app(argc, argv);
-    app.setOrganizationName(QLatin1String("Trolltech"));
+    app.setOrganizationName(QLatin1String("QtProject"));
     app.setApplicationName(QLatin1String("MakeQPF"));
 
     const QStringList arguments = app.arguments();

diff --git a/src/pixeltool/qpixeltool.cpp b/src/pixeltool/qpixeltool.cpp
index 03b66ee..95c0676 100644 (file)
--- a/src/pixeltool/qpixeltool.cpp
+++ b/src/pixeltool/qpixeltool.cpp
@@ -62,7 +62,7 @@ QPixelTool::QPixelTool(QWidget *parent)
     : QWidget(parent)
 {
     setWindowTitle(QLatin1String("PixelTool"));
-    QSettings settings(QLatin1String("Trolltech"), QLatin1String("QPixelTool"));
+    QSettings settings(QLatin1String("QtProject"), QLatin1String("QPixelTool"));
 
     m_freeze = false;
 
@@ -95,7 +95,7 @@ QPixelTool::QPixelTool(QWidget *parent)
 
 QPixelTool::~QPixelTool()
 {
-    QSettings settings(QLatin1String("Trolltech"), QLatin1String("QPixelTool"));
+    QSettings settings(QLatin1String("QtProject"), QLatin1String("QPixelTool"));
     settings.setValue(QLatin1String("autoUpdate"), int(m_autoUpdate));
     settings.setValue(QLatin1String("gridSize"), m_gridSize);
     settings.setValue(QLatin1String("gridActive"), m_gridActive);

diff --git a/src/qconfig/main.cpp b/src/qconfig/main.cpp
index 423d6e0..2dafd7b 100644 (file)
--- a/src/qconfig/main.cpp
+++ b/src/qconfig/main.cpp
@@ -535,8 +535,8 @@ int main(int argc, char** argv)
 {
     QT_USE_NAMESPACE
     QApplication app(argc,argv);
-    app.setOrganizationDomain("trolltech.com");
-    app.setOrganizationName("Trolltech");
+    app.setOrganizationDomain("qt-project.org");
+    app.setOrganizationName("QtProject");
     app.setApplicationName("QConfig");
     Main m;
 

diff --git a/src/qtconfig/mainwindow.cpp b/src/qtconfig/mainwindow.cpp
index 4e901b3..c53ea55 100644 (file)
--- a/src/qtconfig/mainwindow.cpp
+++ b/src/qtconfig/mainwindow.cpp
@@ -239,7 +239,7 @@ MainWindow::MainWindow()
                                    Qt::ToolTipRole);
     ui->guiStyleCombo->addItems(gstyles);
 
-    QSettings settings(QLatin1String("Trolltech"));
+    QSettings settings(QLatin1String("QtProject"));
     settings.beginGroup(QLatin1String("Qt"));
 
     QString currentstyle = settings.value(QLatin1String("style")).toString();
@@ -510,7 +510,7 @@ void MainWindow::fileSave()
     statusBar()->showMessage(tr("Saving changes..."));
 
     {
-        QSettings settings(QLatin1String("Trolltech"));
+        QSettings settings(QLatin1String("QtProject"));
         settings.beginGroup(QLatin1String("Qt"));
         QFontDatabase db;
         QFont font = db.font(ui->fontFamilyCombo->currentText(),