1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix obsolete contact email

Browse Source 
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>
This commit is contained in:
Jason McDonald 2011-07-26 16:11:03 +10:00 committed by Qt by Nokia
parent 3ca3ea4742
commit d692b8663c
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -2970,7 +2970,7 @@ if [ '!' -f "${XQMAKESPEC}/qplatformdefs.h" ]; then
echo echo
echo " $XQMAKESPEC/qplatformdefs.h" echo " $XQMAKESPEC/qplatformdefs.h"
echo echo
echo " Please contact qt-bugs@trolltech.com." echo " Please contact qt-info@nokia.com."
echo echo
exit 2 exit 2
fi fi

2
examples/tutorials/addressbook-fr/README
View File

@ -39,4 +39,4 @@ qmake -spec macx-xcode
Then open the generated Xcode project in Xcode and build it. 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.

2
examples/tutorials/addressbook/README
View File

@ -39,4 +39,4 @@ qmake -spec macx-xcode
Then open the generated Xcode project in Xcode and build it. 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.

4
src/corelib/global/qglobal.h
View File

@ -281,7 +281,7 @@ namespace QT_NAMESPACE {}
# define Q_OS_VXWORKS # define Q_OS_VXWORKS
#elif defined(__MAKEDEPEND__) #elif defined(__MAKEDEPEND__)
#else #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 #endif
#if defined(Q_OS_WIN32) || defined(Q_OS_WIN64) || defined(Q_OS_WINCE) #if defined(Q_OS_WIN32) || defined(Q_OS_WIN64) || defined(Q_OS_WINCE)
@ -803,7 +803,7 @@ namespace QT_NAMESPACE {}
# define Q_CC_NOKIAX86 # define Q_CC_NOKIAX86
#else #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 #endif

2
src/corelib/io/qfilesystemwatcher_inotify.cpp
View File

@ -131,7 +131,7 @@
# define __NR_inotify_rm_watch 286 # define __NR_inotify_rm_watch 286
# define __NR_inotify_init1 328 # define __NR_inotify_init1 328
#else #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 #endif
#if !defined(IN_CLOEXEC) && defined(O_CLOEXEC) && defined(__NR_inotify_init1) #if !defined(IN_CLOEXEC) && defined(O_CLOEXEC) && defined(__NR_inotify_init1)

2
src/gui/kernel/qkeymapper_x11.cpp
View File

@ -513,7 +513,7 @@ void QKeyMapperPrivate::clearMappings()
// ### ??? // ### ???
// if (keyboardLayoutName.isEmpty()) // 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); keyboardInputLocale = q_getKeyboardLocale(layoutName, variantName);
keyboardInputDirection = keyboardInputLocale.textDirection(); keyboardInputDirection = keyboardInputLocale.textDirection();