Fix obsolete contact email

Replace the old Trolltech contact email address with the current Qt
contact email address.

Task-number: QTBUG-20370
Change-Id: If5b9c3a044e1ee46264548eea456c704ced8e363
Reviewed-on: http://codereview.qt.nokia.com/2153
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

diff --git a/configure b/configure
index 74162ca..877b13e 100755 (executable)
--- a/configure
+++ b/configure
@@ -2970,7 +2970,7 @@ if [ '!' -f "${XQMAKESPEC}/qplatformdefs.h" ]; then
     echo
     echo "      $XQMAKESPEC/qplatformdefs.h"
     echo
-    echo "   Please contact qt-bugs@trolltech.com."
+    echo "   Please contact qt-info@nokia.com."
     echo
     exit 2
 fi

diff --git a/examples/tutorials/addressbook-fr/README b/examples/tutorials/addressbook-fr/README
index 3598593..5f82d3c 100644 (file)
--- a/examples/tutorials/addressbook-fr/README
+++ b/examples/tutorials/addressbook-fr/README
@@ -39,4 +39,4 @@ qmake -spec macx-xcode
 
 Then open the generated Xcode project in Xcode and build it.
 
-Feel free to send comments about the tutorial to qt-bugs@trolltech.com.
+Feel free to send comments about the tutorial to qt-info@nokia.com.

diff --git a/examples/tutorials/addressbook/README b/examples/tutorials/addressbook/README
index 20ae7f3..5f364d9 100644 (file)
--- a/examples/tutorials/addressbook/README
+++ b/examples/tutorials/addressbook/README
@@ -39,4 +39,4 @@ qmake -spec macx-xcode
 
 Then open the generated Xcode project in Xcode and build it.
 
-Feel free to send comments about the tutorial to qt-bugs@trolltech.com.
+Feel free to send comments about the tutorial to qt-info@nokia.com.

diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 6dfe805..56022a7 100644 (file)
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -281,7 +281,7 @@ namespace QT_NAMESPACE {}
 #  define Q_OS_VXWORKS
 #elif defined(__MAKEDEPEND__)
 #else
-#  error "Qt has not been ported to this OS - talk to qt-bugs@trolltech.com"
+#  error "Qt has not been ported to this OS - talk to qt-info@nokia.com"
 #endif
 
 #if defined(Q_OS_WIN32) || defined(Q_OS_WIN64) || defined(Q_OS_WINCE)
@@ -803,7 +803,7 @@ namespace QT_NAMESPACE {}
 #  define Q_CC_NOKIAX86
 
 #else
-#  error "Qt has not been tested with this compiler - talk to qt-bugs@trolltech.com"
+#  error "Qt has not been tested with this compiler - talk to qt-info@nokia.com"
 #endif
 
 

diff --git a/src/corelib/io/qfilesystemwatcher_inotify.cpp b/src/corelib/io/qfilesystemwatcher_inotify.cpp
index 5c5223e..ef30224 100644 (file)
--- 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 qt-bugs@trolltech.com"
+# error "This architecture is not supported. Please talk to qt-info@nokia.com"
 #endif
 
 #if !defined(IN_CLOEXEC) && defined(O_CLOEXEC) && defined(__NR_inotify_init1)

diff --git a/src/gui/kernel/qkeymapper_x11.cpp b/src/gui/kernel/qkeymapper_x11.cpp
index e243716..455840f 100644 (file)
--- a/src/gui/kernel/qkeymapper_x11.cpp
+++ b/src/gui/kernel/qkeymapper_x11.cpp
@@ -513,7 +513,7 @@ void QKeyMapperPrivate::clearMappings()
 
         // ### ???
         // if (keyboardLayoutName.isEmpty())
-        //     qWarning("Qt: unable to determine keyboard layout, please talk to qt-bugs@trolltech.com"); ?
+        //     qWarning("Qt: unable to determine keyboard layout, please talk to qt-info@nokia.com"); ?
 
         keyboardInputLocale = q_getKeyboardLocale(layoutName, variantName);
         keyboardInputDirection = keyboardInputLocale.textDirection();