Cleanup our usage of the term "Qt Software".

Reviewed-by: Trust Me

4 files changed, 9 insertions, 9 deletions

diff --git a/examples/dialogs/configdialog/pages.cpp b/examples/dialogs/configdialog/pages.cpp
index e82d74d..49f9024 100644
--- a/examples/dialogs/configdialog/pages.cpp
+++ b/examples/dialogs/configdialog/pages.cpp
@@ -50,11 +50,11 @@ ConfigurationPage::ConfigurationPage(QWidget *parent)
 
     QLabel *serverLabel = new QLabel(tr("Server:"));
     QComboBox *serverCombo = new QComboBox;
-    serverCombo->addItem(tr("Qt Software (Australia)"));
-    serverCombo->addItem(tr("Qt Software (Germany)"));
-    serverCombo->addItem(tr("Qt Software (Norway)"));
-    serverCombo->addItem(tr("Qt Software (People's Republic of China)"));
-    serverCombo->addItem(tr("Qt Software (USA)"));
+    serverCombo->addItem(tr("Qt (Australia)"));
+    serverCombo->addItem(tr("Qt (Germany)"));
+    serverCombo->addItem(tr("Qt (Norway)"));
+    serverCombo->addItem(tr("Qt (People's Republic of China)"));
+    serverCombo->addItem(tr("Qt (USA)"));
 
     QHBoxLayout *serverLayout = new QHBoxLayout;
     serverLayout->addWidget(serverLabel);
diff --git a/examples/graphicsview/portedasteroids/view.cpp b/examples/graphicsview/portedasteroids/view.cpp
index 095700e..5ac62f4 100644
--- a/examples/graphicsview/portedasteroids/view.cpp
+++ b/examples/graphicsview/portedasteroids/view.cpp
@@ -959,7 +959,7 @@ void KAsteroidsView::showEvent( QShowEvent *e )
         QMessageBox::information( this, tr("QGraphicsView demo"),
                                         tr("This game has been implemented using the QGraphicsView class.\n"
                                            "The QGraphicsView class is not part of the Light Platform Edition. Please \n"
-                                           "contact Qt Software if you want to upgrade to the Full Platform Edition.") );
+                                           "contact Nokia if you want to upgrade to the Full Platform Edition.") );
     }
 #endif
 
diff --git a/examples/painting/basicdrawing/renderarea.cpp b/examples/painting/basicdrawing/renderarea.cpp
index 70ef06c..a7a68dc 100644
--- a/examples/painting/basicdrawing/renderarea.cpp
+++ b/examples/painting/basicdrawing/renderarea.cpp
@@ -192,7 +192,7 @@ void RenderArea::paintEvent(QPaintEvent * /* event */)
                 painter.drawPath(path);
                 break;
             case Text:
-                painter.drawText(rect, Qt::AlignCenter, tr("Qt by\nQt Software"));
+                painter.drawText(rect, Qt::AlignCenter, tr("Qt by\nNokia"));
                 break;
             case Pixmap:
                 painter.drawPixmap(10, 10, pixmap);
diff --git a/examples/xmlpatterns/trafficinfo/mainwindow.cpp b/examples/xmlpatterns/trafficinfo/mainwindow.cpp
index 2ea5b24..428ed76 100644
--- a/examples/xmlpatterns/trafficinfo/mainwindow.cpp
+++ b/examples/xmlpatterns/trafficinfo/mainwindow.cpp
@@ -69,7 +69,7 @@ MainWindow::MainWindow()
 
     setWindowTitle(tr("Traffic Info Oslo"));
 
-    const QSettings settings("Qt Software", "trafficinfo");
+    const QSettings settings("Qt Traffic Info", "trafficinfo");
     m_station = StationInformation(settings.value("stationId", "03012130").toString(),
                                    settings.value("stationName", "Nydalen [T-bane] (OSL)").toString());
     m_lines = settings.value("lines", QStringList()).toStringList();
@@ -82,7 +82,7 @@ MainWindow::MainWindow()
 
 MainWindow::~MainWindow()
 {
-    QSettings settings("Qt Software", "trafficinfo");
+    QSettings settings("Qt Traffic Info", "trafficinfo");
     settings.setValue("stationId", m_station.id());
     settings.setValue("stationName", m_station.name());
     settings.setValue("lines", m_lines);