diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-13 17:43:39 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-13 17:43:39 -0600 |
| commit | 359640943bcf155faa9a067dde9e00a123276290 (patch) | |
| tree | fb3d55ea5e18949042fb0064123fb73d2b1eb932 /configure | |
| parent | a829bcdc533e154000803d517200d32fe762e85c (diff) | |
| download | tqt3-359640943bcf155faa9a067dde9e00a123276290.tar.gz tqt3-359640943bcf155faa9a067dde9e00a123276290.zip | |
Automated update from Qt3
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -3124,7 +3124,7 @@ EOF for MODULE in $MODULES; do if [ -d "$relpath/src/$MODULE" ]; then M=`echo $MODULE | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - echo "#define QT_MODULE_$M" >>$outpath/include/ntqmodules.h.new + echo "#define TQT_MODULE_$M" >>$outpath/include/ntqmodules.h.new fi done @@ -3138,7 +3138,7 @@ else fi #------------------------------------------------------------------------------- -# generate QT_BUILD_KEY +# generate TQT_BUILD_KEY #------------------------------------------------------------------------------- # some compilers generate binary incompatible code between different versions, @@ -3275,7 +3275,7 @@ for build_option in $D_FLAGS; do done # sort the compile time defines (helps ensure that changes in this configure -# script don't affect the QT_BUILD_KEY generation) +# script don't affect the TQT_BUILD_KEY generation) if [ -f .options ]; then for opt in `sort -f .options | uniq`; do BUILD_OPTIONS="$BUILD_OPTIONS $opt" @@ -3284,9 +3284,9 @@ fi rm -f .options BUILD_OPTIONS="$BUILD_CONFIG $BUILD_OPTIONS" -QT_BUILD_KEY="$CFG_USER_BUILD_KEY $UNAME_MACHINE $UNAME_SYSTEM $COMPILER $BUILD_OPTIONS" +TQT_BUILD_KEY="$CFG_USER_BUILD_KEY $UNAME_MACHINE $UNAME_SYSTEM $COMPILER $BUILD_OPTIONS" # strip out leading/trailing/extra whitespace -QT_BUILD_KEY=`echo $QT_BUILD_KEY | sed -e "s, *, ,g" -e "s,^ *,," -e "s, *$,,"` +TQT_BUILD_KEY=`echo $TQT_BUILD_KEY | sed -e "s, *, ,g" -e "s,^ *,," -e "s, *$,,"` #------------------------------------------------------------------------------- # part of configuration information goes into ntqconfig.h @@ -3309,7 +3309,7 @@ cat >> $outpath/include/ntqconfig.h.new <<EOF #define QT_PRODUCT_LICENSE "$Products" /* Build key */ -#define QT_BUILD_KEY "$QT_BUILD_KEY" +#define TQT_BUILD_KEY "$TQT_BUILD_KEY" /* Machine byte-order */ #define Q_BIG_ENDIAN 4321 |