summaryrefslogtreecommitdiffstats
path: root/src/network/ssl
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/network/ssl
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/network/ssl')
-rw-r--r--src/network/ssl/qsslconfiguration.h2
-rw-r--r--src/network/ssl/qsslconfiguration_p.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/network/ssl/qsslconfiguration.h b/src/network/ssl/qsslconfiguration.h
index 0736c66..a5ed0b5 100644
--- a/src/network/ssl/qsslconfiguration.h
+++ b/src/network/ssl/qsslconfiguration.h
@@ -41,7 +41,7 @@
/****************************************************************************
**
-** In addition, as a special exception, Trolltech gives permission to link
+** In addition, as a special exception, Nokia gives permission to link
** the code of its release of Qt with the OpenSSL project's "OpenSSL" library
** (or modified versions of the "OpenSSL" library that use the same license
** as the original version), and distribute the linked executables.
diff --git a/src/network/ssl/qsslconfiguration_p.h b/src/network/ssl/qsslconfiguration_p.h
index b2f059b..52e3e95 100644
--- a/src/network/ssl/qsslconfiguration_p.h
+++ b/src/network/ssl/qsslconfiguration_p.h
@@ -41,7 +41,7 @@
/****************************************************************************
**
-** In addition, as a special exception, Trolltech gives permission to link
+** In addition, as a special exception, Nokia gives permission to link
** the code of its release of Qt with the OpenSSL project's "OpenSSL" library
** (or modified versions of the "OpenSSL" library that use the same license
** as the original version), and distribute the linked executables.