summaryrefslogtreecommitdiffstats
path: root/tools/configure
diff options
context:
space:
mode:
authorjutaipal <juhani.taipale@digia.com>2012-12-05 02:50:35 -0800
committerjutaipal <juhani.taipale@digia.com>2012-12-05 02:50:35 -0800
commit76afdfd6765876e0620cbfca1b9ca44d911bdd9c (patch)
treea8c4645de9021e858c934e7eee0c7b932875650c /tools/configure
parentd4d15139c53e7e78be3db32d24ebbfa46db3a759 (diff)
Nokia corp to Digia Plc and contact info changes
Diffstat (limited to 'tools/configure')
-rw-r--r--tools/configure/configureapp.cpp2
-rw-r--r--tools/configure/tools.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index b169a517d0..6d04600877 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -517,7 +517,7 @@ void Configure::parseCmdLine()
else if (configCmdLine.at(i) == "-nokia-developer") {
cout << "Detected -nokia-developer option" << endl;
cout << "Nokia employees and agents are allowed to use this software under" << endl;
- cout << "the authority of Nokia Corporation and/or its subsidiary(-ies)" << endl;
+ cout << "the authority of Digia Plc and/or its subsidiary(-ies)" << endl;
dictionary[ "BUILDNOKIA" ] = "yes";
dictionary[ "BUILDDEV" ] = "yes";
dictionary["LICENSE_CONFIRMED"] = "yes";
diff --git a/tools/configure/tools.cpp b/tools/configure/tools.cpp
index bdfd77082a..4c4a7abc4f 100644
--- a/tools/configure/tools.cpp
+++ b/tools/configure/tools.cpp
@@ -207,7 +207,7 @@ void Tools::checkLicense(QMap<QString,QString> &dictionary, QMap<QString,QString
if (dictionary.value("DONE") == "error") {
cout << "You are not licensed for the " << dictionary["PLATFORM NAME"] << " platform." << endl << endl;
- cout << "Please contact qt-info@nokia.com to upgrade your license" << endl;
+ cout << "Please contact http://www.qt-project.org/legal to upgrade your license" << endl;
cout << "to include the " << dictionary["PLATFORM NAME"] << " platform, or install the" << endl;
cout << "Qt Open Source Edition if you intend to develop free software." << endl;
return;