diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-07 15:18:16 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-07 15:18:16 +0100 |
| commit | cdf13ce286b14273e1e29c5bb02cbc880f31b786 (patch) | |
| tree | 10733cb3fb35647b19cfd15ab158f56b1cb550e1 /tools/configure/tools.cpp | |
| parent | 21d607c81af0cd285e9bb3869ac3cd18358f1c8f (diff) | |
| parent | a8321f21fb82714771b4717c99dd475f2c74649e (diff) | |
Merge branch 'stable' into dev
Conflicts:
tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
Change-Id: I6b8d505fc22f052c307ca27f58f7d16f98965f47
Diffstat (limited to 'tools/configure/tools.cpp')
| -rw-r--r-- | tools/configure/tools.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/tools/configure/tools.cpp b/tools/configure/tools.cpp index fe1721a36f..69347eb583 100644 --- a/tools/configure/tools.cpp +++ b/tools/configure/tools.cpp @@ -58,13 +58,6 @@ 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"; |