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 /configure | |
| 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 'configure')
| -rwxr-xr-x | configure | 8 |
1 files changed, 0 insertions, 8 deletions
@@ -3122,10 +3122,6 @@ addConfStr "$shortspec" [ -d "$outpath/src/corelib/global" ] || mkdir -p "$outpath/src/corelib/global" cat > "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF -/* License Info */ -static const char qt_configure_licensee_str [256 + 12] = "qt_lcnsuser=$Licensee"; -static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$Edition"; - /* Installation date */ static const char qt_configure_installation [12+11] = "qt_instdate=2012-12-20"; @@ -3153,10 +3149,6 @@ $QT_CONFIGURE_STRS#endif # define QT_CONFIGURE_SYSROOTIFY_PREFIX $QMAKE_SYSROOTIFY #endif -/* strlen( "qt_lcnsxxxx" ) == 12 */ -#define QT_CONFIGURE_LICENSEE qt_configure_licensee_str + 12 -#define QT_CONFIGURE_LICENSED_PRODUCTS qt_configure_licensed_products_str + 12 - #define QT_CONFIGURE_PREFIX_PATH qt_configure_prefix_path_str + 12 #ifdef QT_BUILD_QMAKE # define QT_CONFIGURE_EXT_PREFIX_PATH qt_configure_ext_prefix_path_str + 12 |