diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2014-11-28 18:23:22 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-02-05 14:26:58 +0000 |
| commit | 887c8129e6b9c57b353d1b421c2497a6495e0f6b (patch) | |
| tree | 40268d390df06105e330393db8fb1e0c85dfb289 | |
| parent | 6cc1ba92d1600531ce8b1e104eaeaebab035650d (diff) | |
remove trailing semicolons from #defines
Change-Id: I522a7e838ab0e5bbe5b22296ab74912ea79468f0
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | tools/configure/configureapp.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
@@ -3749,10 +3749,10 @@ EOF cat >> "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF /* 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_LICENSEE qt_configure_licensee_str + 12 +#define QT_CONFIGURE_LICENSED_PRODUCTS qt_configure_licensed_products_str + 12 -#define QT_CONFIGURE_SETTINGS_PATH qt_configure_settings_path_str + 12; +#define QT_CONFIGURE_SETTINGS_PATH qt_configure_settings_path_str + 12 EOF # avoid unecessary rebuilds by copying only if qconfig.cpp has changed diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 682f57654f..847ab3a092 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -4020,11 +4020,11 @@ void Configure::generateQConfigCpp() << "static const char qt_sysrootify_prefix[] = \"qt_ssrtfpfx=" << sysrootifyPrefix << "\";\n" << "#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; + << "#define QT_CONFIGURE_LICENSEE qt_configure_licensee_str + 12" << endl + << "#define QT_CONFIGURE_LICENSED_PRODUCTS qt_configure_licensed_products_str + 12" << endl; if ((platform() != WINDOWS) && (platform() != WINDOWS_CE) && (platform() != WINDOWS_RT)) - tmpStream << "#define QT_CONFIGURE_SETTINGS_PATH qt_configure_settings_path_str + 12;" << endl; + tmpStream << "#define QT_CONFIGURE_SETTINGS_PATH qt_configure_settings_path_str + 12" << endl; if (!tmpStream.flush()) dictionary[ "DONE" ] = "error"; |