summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xconfigure2
-rw-r--r--demos/affine/xform.cpp2
-rw-r--r--demos/browser/data/defaultbookmarks.xbel2
-rw-r--r--doc/src/commercialeditions.qdoc2
-rw-r--r--doc/src/designer-manual.qdoc2
-rw-r--r--doc/src/examples/drilldown.qdoc4
-rw-r--r--doc/src/licenses.qdoc2
-rw-r--r--doc/src/opensourceedition.qdoc6
-rw-r--r--doc/src/platform-notes.qdoc8
-rw-r--r--doc/src/snippets/qxmlstreamwriter/main.cpp2
-rw-r--r--examples/dialogs/configdialog/pages.cpp10
-rw-r--r--examples/graphicsview/portedasteroids/view.cpp2
-rw-r--r--examples/painting/basicdrawing/renderarea.cpp2
-rw-r--r--examples/xmlpatterns/trafficinfo/mainwindow.cpp4
-rw-r--r--src/gui/kernel/qdesktopwidget_mac_p.h6
-rw-r--r--tools/installer/nsis/opensource.ini2
-rw-r--r--translations/README2
17 files changed, 30 insertions, 30 deletions
diff --git a/configure b/configure
index 12eaf77..336b7cf 100755
--- a/configure
+++ b/configure
@@ -311,7 +311,7 @@ elif [ $COMMERCIAL_USER = "yes" ]; then
echo
echo "You are using an old license file."
echo
- echo "Please install the license file supplied by Qt Software,"
+ echo "Please install the license file supplied by Nokia,"
echo "or install the Qt Open Source Edition if you intend to"
echo "develop free software."
exit 1
diff --git a/demos/affine/xform.cpp b/demos/affine/xform.cpp
index e3ecb3c..46e6af3 100644
--- a/demos/affine/xform.cpp
+++ b/demos/affine/xform.cpp
@@ -895,7 +895,7 @@ XFormWidget::XFormWidget(QWidget *parent)
// defaults
view->reset();
vectorType->setChecked(true);
- textEditor->setText("Qt Software");
+ textEditor->setText("Qt Affine Transformation Demo");
textEditor->setEnabled(false);
animateButton->animateClick();
diff --git a/demos/browser/data/defaultbookmarks.xbel b/demos/browser/data/defaultbookmarks.xbel
index a168244..8c83032 100644
--- a/demos/browser/data/defaultbookmarks.xbel
+++ b/demos/browser/data/defaultbookmarks.xbel
@@ -4,7 +4,7 @@
<folder folded="yes">
<title>Bookmarks Bar</title>
<bookmark href="http://qtsoftware.com/">
- <title>Qt Software</title>
+ <title>Qt Home Page</title>
</bookmark>
<bookmark href="http://webkit.org/">
<title>WebKit.org</title>
diff --git a/doc/src/commercialeditions.qdoc b/doc/src/commercialeditions.qdoc
index 97c6e47..b6d80c2 100644
--- a/doc/src/commercialeditions.qdoc
+++ b/doc/src/commercialeditions.qdoc
@@ -110,7 +110,7 @@
For further information and assistance, please contact Qt
sales.
- Email: \l{mailto:qt-sales@nokia.com}{qt-sales@nokia.com}.
+ Web: http://www.qtsoftware.com/contact.
Phone, U.S. office (for North America): \bold{1-650-813-1676}.
diff --git a/doc/src/designer-manual.qdoc b/doc/src/designer-manual.qdoc
index ed8f5ff..0aa9963 100644
--- a/doc/src/designer-manual.qdoc
+++ b/doc/src/designer-manual.qdoc
@@ -46,7 +46,7 @@
\ingroup qttools
\keyword Qt Designer
- \QD is Qt Software's tool for designing and building graphical user
+ \QD is Qt's tool for designing and building graphical user
interfaces (GUIs) from Qt components. You can compose and customize your
widgets or dialogs in a what-you-see-is-what-you-get (WYSIWYG) manner, and
test them using different styles and resolutions.
diff --git a/doc/src/examples/drilldown.qdoc b/doc/src/examples/drilldown.qdoc
index f365cf9..abc3d6d 100644
--- a/doc/src/examples/drilldown.qdoc
+++ b/doc/src/examples/drilldown.qdoc
@@ -50,7 +50,7 @@
\image drilldown-example.png Screenshot of the Drill Down Example
When running the example application, a user can retrieve
- information about each of Nokia's Qt Software offices by clicking the
+ information about each of Nokia's Qt offices by clicking the
corresponding image. The application pops up an information window
displaying the data, and allows the users to alter the location
description as well as the image. The main view will be updated
@@ -294,7 +294,7 @@
The QGraphicsView class is part of the \l {The Graphics View
Framework} which we will use to display the images of Nokia's
- Qt Software offices. To be able to respond to user interaction;
+ Qt offices. To be able to respond to user interaction;
i.e., showing the
appropriate information window whenever the user clicks one of the
office images, we reimplement QGraphicsView's \l
diff --git a/doc/src/licenses.qdoc b/doc/src/licenses.qdoc
index f6e70b6..7597e7f 100644
--- a/doc/src/licenses.qdoc
+++ b/doc/src/licenses.qdoc
@@ -50,7 +50,7 @@
\l{GNU Lesser General Public License (LGPL)} or the
\l{Qt Commercial Editions}{Qt Commercial License Agreement}, but rather under
specific licenses from the original authors. Some pieces of code were developed
- by Qt Software and others originated from third parties.
+ by Nokia and others originated from third parties.
This page lists the licenses used, names the authors, and links
to the places where it is used.
diff --git a/doc/src/opensourceedition.qdoc b/doc/src/opensourceedition.qdoc
index 46fdb99..e7bb26a 100644
--- a/doc/src/opensourceedition.qdoc
+++ b/doc/src/opensourceedition.qdoc
@@ -53,7 +53,7 @@
money. The Free Software Foundation (creators of the GNU GPL) speaks
of free in this context as in "free speech", not as in "no cost".
- Qt Software supports the free software concept by providing the Qt Open Source
+ Nokia supports the free software concept by providing the Qt Open Source
Edition, which is licensed under the \l{GNU General Public License (GPL)}
(version 3) and the \l{GNU Lesser General Public License (LGPL)} (version 2.1).
You can use this edition of Qt to create and distribute software with licenses
@@ -81,8 +81,8 @@
used in Qt.
Information about Qt Commercial License Agreements is available
- in the \l{Qt Licensing Overview} on the Qt website or by email
- from \l{mailto:qt-sales@nokia.com}{qt-sales@nokia.com}.
+ in the \l{Qt Licensing Overview} on the Qt website or by contacting
+ the sales department at http://www.qtsoftware.com/contact.
If you are in doubt what edition of Qt is right for your project,
please contact
diff --git a/doc/src/platform-notes.qdoc b/doc/src/platform-notes.qdoc
index cd782fe..23094e1 100644
--- a/doc/src/platform-notes.qdoc
+++ b/doc/src/platform-notes.qdoc
@@ -157,7 +157,7 @@
\target IRIX
\section1 IRIX - 6.5.x
- \bold{IRIX is an unsupported platform - please see Qt Software's online
+ \bold{IRIX is an unsupported platform - please see Qt's online
\l{Platform Support Policy} for details.}
Unpackaging and IRIX tar:
@@ -382,7 +382,7 @@
Qt is supported on a variety of 32-bit and 64-bit platforms, and can
usually be built on each platform with GCC, a vendor-supplied compiler, or
a third party compiler. Although Qt may be built on a range of platform-compiler
- combinations, only a subset of these are actively supported by Qt Software.
+ combinations, only a subset of these are actively supported by Qt.
A more general overview of the platforms Qt runs on can be found on the
\l{Platform Notes} page. Information about the compilers used on each platform
@@ -472,7 +472,7 @@
\row \o Windows XP/Vista \o Intel 32/64-bit \o win32-msvc.net \o Visual Studio 2002
\endtable
- Qt Software's online \l{Platform Support Policy} for Qt describes the level of
+ Qt's online \l{Platform Support Policy} for Qt describes the level of
support you should expect for these platforms.
\section1 Supported Features
@@ -601,7 +601,7 @@
\section2 Intel C++ Compiler for Linux
- Qt Software currently tests the following compilers:
+ Nokia currently tests the following compilers:
\list
diff --git a/doc/src/snippets/qxmlstreamwriter/main.cpp b/doc/src/snippets/qxmlstreamwriter/main.cpp
index 56ff3d6..3d0f981 100644
--- a/doc/src/snippets/qxmlstreamwriter/main.cpp
+++ b/doc/src/snippets/qxmlstreamwriter/main.cpp
@@ -63,7 +63,7 @@ int main(int argc, char *argv[])
//! [write element]
stream.writeStartElement("bookmark");
stream.writeAttribute("href", "http://www.qtsoftware.com/");
- stream.writeTextElement("title", "Qt Software");
+ stream.writeTextElement("title", "Qt Home");
stream.writeEndElement(); // bookmark
//! [write element]
stream.writeEndElement(); // folder
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);
diff --git a/src/gui/kernel/qdesktopwidget_mac_p.h b/src/gui/kernel/qdesktopwidget_mac_p.h
index d16dfb5..0fdc455 100644
--- a/src/gui/kernel/qdesktopwidget_mac_p.h
+++ b/src/gui/kernel/qdesktopwidget_mac_p.h
@@ -43,9 +43,9 @@
// W A R N I N G
// -------------
//
-// This file is not part of the Qt API. It exists for the convenience
-// of the Mac developers at Qt Software. This header file may change
-// from version to version without notice, or even be removed.
+// This file is not part of the Qt API. It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
//
// We mean it.
//
diff --git a/tools/installer/nsis/opensource.ini b/tools/installer/nsis/opensource.ini
index 322e945..b7affdb 100644
--- a/tools/installer/nsis/opensource.ini
+++ b/tools/installer/nsis/opensource.ini
@@ -73,7 +73,7 @@ Bottom=120
[Field 4]
Type=Label
-Text=To read more about Nokia/Qt Software's licensing, please go to:
+Text=To read more about Nokia's licensing, please go to:
Left=0
Right=278
Top=97
diff --git a/translations/README b/translations/README
index ffce117..3eec817 100644
--- a/translations/README
+++ b/translations/README
@@ -1,4 +1,4 @@
The French, German, and Simplified Chinese translation files are
-supported by Qt Software. All other translations are contributed by
+supported by Qt. All other translations are contributed by
third parties. These are provided without guarantees and may
disappear from future Qt releases.
generated by cgit v0.12 at 2024-11-29 16:54:08 (GMT)