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

Update obsolete contact address.

Browse Source 
Replace Nokia contact email address with Qt Project website.

Change-Id: Id689fdb78727abafba033bed7b0402e2cf27aba1
Reviewed-by: Jonas Gastal <jgastal@profusion.mobi>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
This commit is contained in:
Jason McDonald 2012-01-20 13:21:44 +10:00 committed by Qt by Nokia
parent 629d6eda5c
commit 7827c1861f
7 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/tools/customtype/main.cpp
View File

@ -47,7 +47,7 @@ int main(int argc, char *argv[])
QCoreApplication app(argc, argv); QCoreApplication app(argc, argv);
QStringList headers; QStringList headers;
headers << "Subject: Hello World" headers << "Subject: Hello World"
<< "From: qt-info@nokia.com"; << "From: address@example.com";
QString body = "This is a test.\r\n"; QString body = "This is a test.\r\n";
//! [printing a custom type] //! [printing a custom type]

2
examples/tools/customtypesending/main.cpp
View File

@ -50,7 +50,7 @@ int main(int argc, char *argv[])
Window window1; Window window1;
QStringList headers; QStringList headers;
headers << "Subject: Hello World" headers << "Subject: Hello World"
<< "From: qt-info@nokia.com"; << "From: address@example.com";
QString body = "This is a test.\r\n"; QString body = "This is a test.\r\n";
Message message(body, headers); Message message(body, headers);
window1.setMessage(message); window1.setMessage(message);

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

@ -38,5 +38,3 @@ You can do this by typing the following at the command line:
qmake -spec macx-xcode 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-info@nokia.com.

2
examples/tutorials/addressbook/README
View File

@ -38,5 +38,3 @@ You can do this by typing the following at the command line:
qmake -spec macx-xcode 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-info@nokia.com.

2
header.LGPL-ONLY
View File

@ -16,7 +16,7 @@
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** 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 ** If you have questions regarding the use of this file, please contact
** Nokia at qt-info@nokia.com. ** us via http://www.qt-project.org/.
** $QT_END_LICENSE$ ** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/

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

@ -262,7 +262,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-info@nokia.com" # error "Qt has not been ported to this OS - see http://www.qt-project.org/"
#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)
@ -751,7 +751,7 @@ namespace QT_NAMESPACE {}
# define Q_NO_USING_KEYWORD /* ### check "using" status */ # define Q_NO_USING_KEYWORD /* ### check "using" status */
#else #else
# error "Qt has not been tested with this compiler - talk to qt-info@nokia.com" # error "Qt has not been tested with this compiler - see http://www.qt-project.org/"
#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-info@nokia.com" # error "This architecture is not supported. Please see http://www.qt-project.org/"
#endif #endif
#if !defined(IN_CLOEXEC) && defined(O_CLOEXEC) && defined(__NR_inotify_init1) #if !defined(IN_CLOEXEC) && defined(O_CLOEXEC) && defined(__NR_inotify_init1)