diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-07-26 16:11:03 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-28 10:03:45 +0200 |
| commit | d692b8663c062e3b7f146529d29194ca8724f214 (patch) | |
| tree | e20cdedebe7b1e006a333e889022b3fe37fedec5 /src | |
| parent | 3ca3ea4742f937185a1d64f93f9a687147c97212 (diff) | |
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/global/qglobal.h | 4 | ||||
| -rw-r--r-- | src/corelib/io/qfilesystemwatcher_inotify.cpp | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qkeymapper_x11.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 6dfe805a92..56022a7e6e 100644 --- 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 5c5223eb1c..ef302243da 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 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 e243716f6a..455840f8b2 100644 --- 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(); |