diff options
| author | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-05-22 15:38:00 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-05-27 15:28:54 +0000 |
| commit | d2da14a9e05381eb3dd70071001dce72b2a465f3 (patch) | |
| tree | 9d76bcc0d0bb1710e8198563d9687103ca9096ad /tools/configure/configureapp.cpp | |
| parent | e63dde49678baf8041e32254a7b6b35d871d201f (diff) | |
configure: Remove COMMERCIAL_VERSION define
Not used anymore.
Change-Id: I7db671008758e79598697e06e12f1b959bf479c6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'tools/configure/configureapp.cpp')
| -rw-r--r-- | tools/configure/configureapp.cpp | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 10b33f41e4..faeb45417b 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -34,9 +34,7 @@ #include "configureapp.h" #include "environment.h" -#ifdef COMMERCIAL_VERSION -# include "tools.h" -#endif +#include "tools.h" #include <qdir.h> #include <qdiriterator.h> @@ -4507,19 +4505,9 @@ void Configure::readLicense() cout << endl << "Cannot find the GPL license files! Please download the Open Source version of the library." << endl; dictionary["DONE"] = "error"; } -#ifdef COMMERCIAL_VERSION else { Tools::checkLicense(dictionary, sourcePath, buildPath); } -#else // !COMMERCIAL_VERSION - else { - cout << endl << "Error: This is the Open Source version of Qt." - << endl << "If you want to use Enterprise features of Qt," - << endl << "information use the contact form at http://www.qt.io/contact-us" - << endl << "to purchase a license." << endl << endl; - dictionary["DONE"] = "error"; - } -#endif } void Configure::reloadCmdLine() |