diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2016-05-11 14:36:13 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@theqtcompany.com> | 2016-05-23 11:19:45 +0000 |
| commit | aa2a3102676a5608d7ad22b868895ec93681a5d9 (patch) | |
| tree | 7a1c08e758febf5ca2be851f3e20d598f8d35811 /tools | |
| parent | 9fd407fc6a29c94b4568dd042a05c208255179e0 (diff) | |
Deprecate QLibraryInfo::licensee()/licensedProducts()
This info wasn't really very helpful, and would anyway always
contain either Preview, OpenSource or an empty string for
commercial users.
Change-Id: I311b991834fa83cf1a183083acd5112cda3d2e41
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index c40d11d284..c3b9e642eb 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -3951,11 +3951,7 @@ void Configure::generateQConfigCpp() // Generate the new qconfig.cpp file { FileWriter tmpStream(buildPath + "/src/corelib/global/qconfig.cpp"); - tmpStream << "/* Licensed */" << endl - << "static const char qt_configure_licensee_str [512 + 12] = \"qt_lcnsuser=" << dictionary["LICENSEE"] << "\";" << endl - << "static const char qt_configure_licensed_products_str [512 + 12] = \"qt_lcnsprod=" << dictionary["EDITION"] << "\";" << endl - << endl - << "/* Build date */" << endl + tmpStream << "/* Build date */" << endl << "static const char qt_configure_installation [11 + 12] = \"qt_instdate=2012-12-20\";" << endl << endl << "/* Installation Info */" << endl @@ -3983,9 +3979,6 @@ void Configure::generateQConfigCpp() << "#ifdef QT_BUILD_QMAKE\n" << "# define QT_CONFIGURE_SYSROOTIFY_PREFIX " << (sysrootifyPrefix ? "true" : "false") << endl << "#endif\n\n" - << "/* strlen( \"qt_lcnsxxxx\") == 12 */" << endl - << "#define QT_CONFIGURE_LICENSEE qt_configure_licensee_str + 12" << endl - << "#define QT_CONFIGURE_LICENSED_PRODUCTS qt_configure_licensed_products_str + 12" << endl << endl << "#define QT_CONFIGURE_PREFIX_PATH qt_configure_prefix_path_str + 12\n" << "#ifdef QT_BUILD_QMAKE\n" |