Update obsolete contact address.

Replace Nokia contact email address with Qt Project website.

Change-Id: Id689fdb78727abafba033bed7b0402e2cf27aba1
Reviewed-by: Jonas Gastal <[email protected]>
Reviewed-by: Rohan McGovern <[email protected]>

7 files changed, 6 insertions, 10 deletions

diff --git a/examples/tools/customtype/main.cpp b/examples/tools/customtype/main.cpp
index 910804cda90..eabcfbfb5aa 100644
--- a/examples/tools/customtype/main.cpp
+++ b/examples/tools/customtype/main.cpp
@@ -47,7 +47,7 @@ int main(int argc, char *argv[])
     QCoreApplication app(argc, argv);
     QStringList headers;
     headers << "Subject: Hello World"
-            << "From: [email protected]";
+            << "From: [email protected]";
     QString body = "This is a test.\r\n";
 
 //! [printing a custom type]
diff --git a/examples/tools/customtypesending/main.cpp b/examples/tools/customtypesending/main.cpp
index 5768e3a9af6..491196fe32a 100644
--- a/examples/tools/customtypesending/main.cpp
+++ b/examples/tools/customtypesending/main.cpp
@@ -50,7 +50,7 @@ int main(int argc, char *argv[])
     Window window1;
     QStringList headers;
     headers << "Subject: Hello World"
-            << "From: [email protected]";
+            << "From: [email protected]";
     QString body = "This is a test.\r\n";
     Message message(body, headers);
     window1.setMessage(message);
diff --git a/examples/tutorials/addressbook-fr/README b/examples/tutorials/addressbook-fr/README
index 5f82d3ce385..d24cedf51ec 100644
--- a/examples/tutorials/addressbook-fr/README
+++ b/examples/tutorials/addressbook-fr/README
@@ -38,5 +38,3 @@ You can do this by typing the following at the command line:
 qmake -spec macx-xcode
 
 Then open the generated Xcode project in Xcode and build it.
-
-Feel free to send comments about the tutorial to [email protected].
diff --git a/examples/tutorials/addressbook/README b/examples/tutorials/addressbook/README
index 5f364d909c7..39753b4b252 100644
--- a/examples/tutorials/addressbook/README
+++ b/examples/tutorials/addressbook/README
@@ -38,5 +38,3 @@ You can do this by typing the following at the command line:
 qmake -spec macx-xcode
 
 Then open the generated Xcode project in Xcode and build it.
-
-Feel free to send comments about the tutorial to [email protected].
diff --git a/header.LGPL-ONLY b/header.LGPL-ONLY
index 8c6172f044e..5e2f6ba47b8 100644
--- a/header.LGPL-ONLY
+++ b/header.LGPL-ONLY
@@ -16,7 +16,7 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** If you have questions regarding the use of this file, please contact
-** Nokia at [email protected].
+** us via http://www.qt-project.org/.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 16f2c117f99..8ae8dba8b15 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -262,7 +262,7 @@ namespace QT_NAMESPACE {}
 #  define Q_OS_VXWORKS
 #elif defined(__MAKEDEPEND__)
 #else
-#  error "Qt has not been ported to this OS - talk to [email protected]"
+#  error "Qt has not been ported to this OS - see http://www.qt-project.org/"
 #endif
 
 #if defined(Q_OS_WIN32) || defined(Q_OS_WIN64) || defined(Q_OS_WINCE)
@@ -751,7 +751,7 @@ namespace QT_NAMESPACE {}
 #  define Q_NO_USING_KEYWORD /* ### check "using" status */
 
 #else
-#  error "Qt has not been tested with this compiler - talk to [email protected]"
+#  error "Qt has not been tested with this compiler - see http://www.qt-project.org/"
 #endif
 
 
diff --git a/src/corelib/io/qfilesystemwatcher_inotify.cpp b/src/corelib/io/qfilesystemwatcher_inotify.cpp
index 36be778e5dd..4cc6bd4690c 100644
--- a/src/corelib/io/qfilesystemwatcher_inotify.cpp
+++ b/src/corelib/io/qfilesystemwatcher_inotify.cpp
@@ -131,7 +131,7 @@
 # define __NR_inotify_rm_watch  286
 # define __NR_inotify_init1     328
 #else
-# error "This architecture is not supported. Please talk to [email protected]"
+# error "This architecture is not supported. Please see http://www.qt-project.org/"
 #endif
 
 #if !defined(IN_CLOEXEC) && defined(O_CLOEXEC) && defined(__NR_inotify_init1)