diff options
| -rw-r--r-- | examples/tools/customtype/main.cpp | 2 | ||||
| -rw-r--r-- | examples/tools/customtypesending/main.cpp | 2 | ||||
| -rw-r--r-- | examples/tutorials/addressbook-fr/README | 2 | ||||
| -rw-r--r-- | examples/tutorials/addressbook/README | 2 | ||||
| -rw-r--r-- | header.LGPL-ONLY | 2 | ||||
| -rw-r--r-- | src/corelib/global/qglobal.h | 4 | ||||
| -rw-r--r-- | src/corelib/io/qfilesystemwatcher_inotify.cpp | 2 |
7 files changed, 6 insertions, 10 deletions
diff --git a/examples/tools/customtype/main.cpp b/examples/tools/customtype/main.cpp index 910804cda9..eabcfbfb5a 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: qt-info@nokia.com"; + << "From: address@example.com"; 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 5768e3a9af..491196fe32 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: qt-info@nokia.com"; + << "From: address@example.com"; 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 5f82d3ce38..d24cedf51e 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 qt-info@nokia.com. diff --git a/examples/tutorials/addressbook/README b/examples/tutorials/addressbook/README index 5f364d909c..39753b4b25 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 qt-info@nokia.com. diff --git a/header.LGPL-ONLY b/header.LGPL-ONLY index 8c6172f044..5e2f6ba47b 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 qt-info@nokia.com. +** 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 16f2c117f9..8ae8dba8b1 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 qt-info@nokia.com" +# 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 qt-info@nokia.com" +# 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 36be778e5d..4cc6bd4690 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-info@nokia.com" +# 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) |