summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2009-08-12 07:04:56 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2009-08-12 07:04:56 (GMT)
commit1047445648b7eb5b85107c00ea43885b44f891cd (patch)
tree0f9735d5a1b83cb1e3764c4d388f96bff20f2a8b /src/corelib
parent96b6a3c9cd84dbd90bd1fac84a077c01062c5871 (diff)
downloadQt-1047445648b7eb5b85107c00ea43885b44f891cd.zip
Qt-1047445648b7eb5b85107c00ea43885b44f891cd.tar.gz
Qt-1047445648b7eb5b85107c00ea43885b44f891cd.tar.bz2
Replace some mentions of Trolltech with more appropriate terms.
Reviewed-by: Trust Me
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/codecs/qtsciicodec.cpp2
-rw-r--r--src/corelib/codecs/qtsciicodec_p.h2
-rw-r--r--src/corelib/global/qglobal.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/codecs/qtsciicodec.cpp b/src/corelib/codecs/qtsciicodec.cpp
index 81addde..65367d5 100644
--- a/src/corelib/codecs/qtsciicodec.cpp
+++ b/src/corelib/codecs/qtsciicodec.cpp
@@ -41,7 +41,7 @@
// Most of the code here was originally written by Hans Petter Bieker,
// and is included in Qt with the author's permission, and the grateful
-// thanks of the Trolltech team.
+// thanks of the Qt team.
#include "qtsciicodec_p.h"
#include "qlist.h"
diff --git a/src/corelib/codecs/qtsciicodec_p.h b/src/corelib/codecs/qtsciicodec_p.h
index 42beb44..190d496 100644
--- a/src/corelib/codecs/qtsciicodec_p.h
+++ b/src/corelib/codecs/qtsciicodec_p.h
@@ -41,7 +41,7 @@
// Most of the code here was originally written by Hans Petter Bieker,
// and is included in Qt with the author's permission, and the grateful
-// thanks of the Trolltech team.
+// thanks of the Qt team.
/*
* Copyright (C) 2000 Hans Petter Bieker. All rights reserved.
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 7081d2f..7076a1e 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -1292,7 +1292,7 @@ class QDataStream;
/*
No, this is not an evil backdoor. QT_BUILD_INTERNAL just exports more symbols
- for Trolltech's internal unit tests. If you want slower loading times and more
+ for Qt's internal unit tests. If you want slower loading times and more
symbols that can vanish from version to version, feel free to define QT_BUILD_INTERNAL.
*/
#if defined(QT_BUILD_INTERNAL) && defined(Q_OS_WIN) && defined(QT_MAKEDLL)