1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove trailing semicolons from #defines

Browse Source 
Change-Id: I522a7e838ab0e5bbe5b22296ab74912ea79468f0
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
This commit is contained in:
Oswald Buddenhagen 2014-11-28 18:23:22 +01:00
parent 6cc1ba92d1
commit 887c8129e6
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

@ -3749,10 +3749,10 @@ EOF
cat >> "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF cat >> "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF
/* strlen( "qt_lcnsxxxx" ) == 12 */ /* strlen( "qt_lcnsxxxx" ) == 12 */
#define QT_CONFIGURE_LICENSEE qt_configure_licensee_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_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 EOF
# avoid unecessary rebuilds by copying only if qconfig.cpp has changed # avoid unecessary rebuilds by copying only if qconfig.cpp has changed

6
tools/configure/configureapp.cpp
View File

@ -4020,11 +4020,11 @@ void Configure::generateQConfigCpp()
<< "static const char qt_sysrootify_prefix[] = \"qt_ssrtfpfx=" << sysrootifyPrefix << "\";\n" << "static const char qt_sysrootify_prefix[] = \"qt_ssrtfpfx=" << sysrootifyPrefix << "\";\n"
<< "#endif\n\n" << "#endif\n\n"
<< "/* strlen( \"qt_lcnsxxxx\") == 12 */" << endl << "/* strlen( \"qt_lcnsxxxx\") == 12 */" << endl
<< "#define QT_CONFIGURE_LICENSEE qt_configure_licensee_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; << "#define QT_CONFIGURE_LICENSED_PRODUCTS qt_configure_licensed_products_str + 12" << endl;
if ((platform() != WINDOWS) && (platform() != WINDOWS_CE) && (platform() != WINDOWS_RT)) 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()) if (!tmpStream.flush())
dictionary[ "DONE" ] = "error"; dictionary[ "DONE" ] = "error";