diff options
| author | Marius Storm-Olsen <marius@trolltech.com> | 2009-04-08 06:18:55 (GMT) |
|---|---|---|
| committer | Marius Storm-Olsen <marius@trolltech.com> | 2009-04-08 06:26:35 (GMT) |
| commit | 7332065a28577444e7c97617fb03d0f14c706b5b (patch) | |
| tree | 8565ab96c8e3346f91a6a76b3c5a4301bae31501 | |
| parent | 64858dcac58621295c419903efe58ce9a8d0e5b7 (diff) | |
| download | Qt-7332065a28577444e7c97617fb03d0f14c706b5b.zip Qt-7332065a28577444e7c97617fb03d0f14c706b5b.tar.gz Qt-7332065a28577444e7c97617fb03d0f14c706b5b.tar.bz2 | |
Don't check license for internal configurations
A Nokia build doesn't require a license.
Reviewed-by: mauricek
BT: yes
| -rw-r--r-- | tools/configure/configureapp.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index df583a6..5e77606 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -3511,7 +3511,8 @@ void Configure::readLicense() } #else } else { - Tools::checkLicense(dictionary, licenseInfo, firstLicensePath()); + if (dictionary[ "BUILDNOKIA" ] != "yes") + Tools::checkLicense(dictionary, licenseInfo, firstLicensePath()); if (dictionary["DONE"] != "error") { // give the user some feedback, and prompt for license acceptance cout << endl << "This is the " << dictionary["PLATFORM NAME"] << " " << dictionary["EDITION"] << " Edition."<< endl << endl; |