diff options
| author | Maurice Kalinowski <maurice.kalinowski@nokia.com> | 2009-04-08 10:47:47 (GMT) |
|---|---|---|
| committer | Maurice Kalinowski <maurice.kalinowski@nokia.com> | 2009-04-08 10:49:09 (GMT) |
| commit | 3b5f04843c9ab5e0ccce7f4aa8a73d45c9021c35 (patch) | |
| tree | 5d49a8781ce1828b243bdc3251436e8ab784f3cc /tools/configure/tools.cpp | |
| parent | be3b8acbd311b9cbeaa7c87b4f34b2e33b4a7fa3 (diff) | |
| download | Qt-3b5f04843c9ab5e0ccce7f4aa8a73d45c9021c35.zip Qt-3b5f04843c9ab5e0ccce7f4aa8a73d45c9021c35.tar.gz Qt-3b5f04843c9ab5e0ccce7f4aa8a73d45c9021c35.tar.bz2 | |
update/fix configure
Reviewed-by: Thiago
- display the nokia internal usage text like on configure
- instead of skipping the license check we need to actually call it to
set QT_EDITION and friends properly. Otherwise the build gets broken.
Diffstat (limited to 'tools/configure/tools.cpp')
| -rw-r--r-- | tools/configure/tools.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tools/configure/tools.cpp b/tools/configure/tools.cpp index 760c101..2649d44 100644 --- a/tools/configure/tools.cpp +++ b/tools/configure/tools.cpp @@ -58,6 +58,13 @@ using namespace std; void Tools::checkLicense(QMap<QString,QString> &dictionary, QMap<QString,QString> &licenseInfo, const QString &path) { + if (dictionary[ "BUILDNOKIA" ] == "yes") { + dictionary["EDITION"] = "NokiaInternalBuild"; + dictionary["LICENSE_FILE"] = ""; // No License for nokia developers + dictionary["QT_EDITION"] = "QT_EDITION_OPENSOURCE"; + return; // No license key checking in internal builds + } + QString tpLicense = dictionary["QT_SOURCE_TREE"] + "/LICENSE.PREVIEW.OPENSOURCE"; if (QFile::exists(tpLicense)) { dictionary["EDITION"] = "Preview"; |