From f987a8dd52055b7d1090ec714b57b6e4acbf9c40 Mon Sep 17 00:00:00 2001 From: jutaipal Date: Tue, 11 Dec 2012 01:08:36 -0800 Subject: Changed contact info from qt-info@nokia to qt-project.org/legal --- configure | 10 +++++----- doc/src/legal/opensourceedition.qdoc | 2 +- doc/src/modules.qdoc | 6 +++--- doc/src/platforms/emb-porting.qdoc | 2 +- examples/tools/customtype/main.cpp | 2 +- examples/tools/customtypesending/main.cpp | 2 +- tests/auto/uic3/baseline/licenseagreementpage.ui | 2 +- tests/auto/uic3/baseline/licenseagreementpage.ui.4 | 2 +- tools/configure/tools.cpp | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/configure b/configure index 34a60d8..a919c23 100755 --- a/configure +++ b/configure @@ -500,7 +500,7 @@ elif [ $COMMERCIAL_USER = "yes" ]; then echo echo "You are not licensed for the $Platform platform." echo - echo "Please contact qt-info@nokia.com to upgrade your license to" + echo "Please contact http://www.qt-project.org/legal to upgrade your license to" echo "include the $Platform platform, or install the Qt Open Source Edition" echo "if you intend to develop free software." exit 1 @@ -2662,7 +2662,7 @@ if [ "$CFG_RTOS_ENABLED" = "no" ]; then echo "" echo "You are not licensed for Qt for `basename $XPLATFORM`." echo "" - echo "Please contact qt-info@nokia.com to upgrade your license to" + echo "Please contact http://www.qt-project.org/legal to upgrade your license to" echo "include this platform, or install the Qt Open Source Edition" echo "if you intend to develop free software." exit 1 @@ -4029,7 +4029,7 @@ elif [ "$Edition" != "OpenSource" ]; then echo " Your support and upgrade period has expired." echo echo " You are no longer licensed to use this version of Qt." - echo " Please contact qt-info@nokia.com to renew your support" + echo " Please contact http://www.qt-project.org/legal to renew your support" echo " and upgrades for this license." echo echo "NOTICE NOTICE NOTICE NOTICE" @@ -4047,7 +4047,7 @@ elif [ "$Edition" != "OpenSource" ]; then echo " support, nor are you entitled to use any more recent" echo " Qt releases." echo - echo " Please contact qt-info@nokia.com to renew your" + echo " Please contact http://www.qt-project.org/legal to renew your" echo " support and upgrades for this license." echo echo "WARNING WARNING WARNING WARNING" @@ -4062,7 +4062,7 @@ elif [ "$Edition" != "OpenSource" ]; then echo " Your Evaluation license has expired." echo echo " You are no longer licensed to use this software. Please" - echo " contact qt-info@nokia.com to purchase license, or install" + echo " contact http://www.qt-project.org/legal to purchase license, or install" echo " the Qt Open Source Edition if you intend to develop free" echo " software." echo diff --git a/doc/src/legal/opensourceedition.qdoc b/doc/src/legal/opensourceedition.qdoc index f4f0970..e5beb17 100644 --- a/doc/src/legal/opensourceedition.qdoc +++ b/doc/src/legal/opensourceedition.qdoc @@ -87,6 +87,6 @@ If you are in doubt what edition of Qt is right for your project, please contact - \l{mailto:qt-info@nokia.com}{qt-info@nokia.com}. + \l{mailto:http://www.qt-project.org/legal}{http://www.qt-project.org/legal}. */ diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc index 3fa31f3..9bdf4ab 100644 --- a/doc/src/modules.qdoc +++ b/doc/src/modules.qdoc @@ -876,7 +876,7 @@ Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).\br All rights reserved. - Contact: Digia Plc (qt-info@nokia.com)\br + Contact: Digia Plc (http://www.qt-project.org/legal)\br You may use this file under the terms of the BSD license as follows:\br @@ -928,7 +928,7 @@ Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).\br All rights reserved. - Contact: Digia Plc (qt-info@nokia.com)\br + Contact: Digia Plc (http://www.qt-project.org/legal)\br You may use this file under the terms of the BSD license as follows:\br @@ -1023,7 +1023,7 @@ Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).\br All rights reserved. - Contact: Digia Plc (qt-info@nokia.com) + Contact: Digia Plc (http://www.qt-project.org/legal) You may use this file under the terms of the BSD license as follows: diff --git a/doc/src/platforms/emb-porting.qdoc b/doc/src/platforms/emb-porting.qdoc index f2d3ff6..61860cf 100644 --- a/doc/src/platforms/emb-porting.qdoc +++ b/doc/src/platforms/emb-porting.qdoc @@ -50,7 +50,7 @@ the standard C library and some POSIX functions, but only a Linux implementation is publically available. If you are looking for a non-Linux commercial implementation, it is worth contacting \l - {mailto:qt-info@nokia.com}{qt-info@nokia.com} to see if we can + {mailto:http://www.qt-project.org/legal}{http://www.qt-project.org/legal} to see if we can help. There are several issues to be aware of if you plan to do your own diff --git a/examples/tools/customtype/main.cpp b/examples/tools/customtype/main.cpp index c7907c2..07cbd52 100644 --- a/examples/tools/customtype/main.cpp +++ b/examples/tools/customtype/main.cpp @@ -49,7 +49,7 @@ int main(int argc, char *argv[]) QCoreApplication app(argc, argv); QStringList headers; headers << "Subject: Hello World" - << "From: qt-info@nokia.com"; + << "From: http://www.qt-project.org/legal"; 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 e3bd62a..8bb0879 100644 --- a/examples/tools/customtypesending/main.cpp +++ b/examples/tools/customtypesending/main.cpp @@ -52,7 +52,7 @@ int main(int argc, char *argv[]) Window window1; QStringList headers; headers << "Subject: Hello World" - << "From: qt-info@nokia.com"; + << "From: http://www.qt-project.org/legal"; QString body = "This is a test.\r\n"; Message message(body, headers); window1.setMessage(message); diff --git a/tests/auto/uic3/baseline/licenseagreementpage.ui b/tests/auto/uic3/baseline/licenseagreementpage.ui index 195825d..5d0e930 100644 --- a/tests/auto/uic3/baseline/licenseagreementpage.ui +++ b/tests/auto/uic3/baseline/licenseagreementpage.ui @@ -105,7 +105,7 @@ The license could not be found in the package. The package might be corrupted. -Please contact qt-info@nokia.com to resolve the problem. +Please contact http://www.qt-project.org/legal to resolve the problem. diff --git a/tests/auto/uic3/baseline/licenseagreementpage.ui.4 b/tests/auto/uic3/baseline/licenseagreementpage.ui.4 index 8d81c5c..0bf98d3 100644 --- a/tests/auto/uic3/baseline/licenseagreementpage.ui.4 +++ b/tests/auto/uic3/baseline/licenseagreementpage.ui.4 @@ -89,7 +89,7 @@ The license could not be found in the package. The package might be corrupted. -Please contact qt-info@nokia.com to resolve the problem. +Please contact http://www.qt-project.org/legal to resolve the problem. diff --git a/tools/configure/tools.cpp b/tools/configure/tools.cpp index 4160feb..ad7176e 100644 --- a/tools/configure/tools.cpp +++ b/tools/configure/tools.cpp @@ -207,7 +207,7 @@ void Tools::checkLicense(QMap &dictionary, QMap