diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 873568daf8..092e26abfd 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -4187,7 +4187,7 @@ void Configure::readLicense() } #ifdef COMMERCIAL_VERSION else { - Tools::checkLicense(dictionary, licenseInfo, firstLicensePath()); + Tools::checkLicense(dictionary, licenseInfo, firstLicensePath(), sourcePath); 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; diff --git a/tools/configure/tools.cpp b/tools/configure/tools.cpp index 5161f77203..ed0f3efb1b 100644 --- a/tools/configure/tools.cpp +++ b/tools/configure/tools.cpp @@ -56,16 +56,16 @@ std::ostream &operator<<(std::ostream &s, const QString &val); // defined in con using namespace std; void Tools::checkLicense(QMap &dictionary, QMap &licenseInfo, - const QString &path) + const QString &path, const QString &sourcePath) { - QString tpLicense = dictionary["QT_SOURCE_TREE"] + "/LICENSE.PREVIEW.OPENSOURCE"; + QString tpLicense = sourcePath + "/LICENSE.PREVIEW.OPENSOURCE"; if (QFile::exists(tpLicense)) { dictionary["EDITION"] = "Preview"; dictionary["LICENSE FILE"] = tpLicense; dictionary["QT_EDITION"] = "QT_EDITION_OPENSOURCE"; return; // No license key checking in Tech Preview } - tpLicense = dictionary["QT_SOURCE_TREE"] + "/LICENSE.PREVIEW.COMMERCIAL"; + tpLicense = sourcePath + "/LICENSE.PREVIEW.COMMERCIAL"; if (QFile::exists(tpLicense)) { dictionary["EDITION"] = "Preview"; dictionary["LICENSE FILE"] = tpLicense; @@ -204,7 +204,7 @@ void Tools::checkLicense(QMap &dictionary, QMap &dictionary, QMap &dictionary, QMap &licenseInfo, - const QString &path); + const QString &path, const QString &sourcePath); }; #endif // _TOOLS_H_