Ignore:
Timestamp:
Feb 11, 2010, 11:19:06 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.1 sources.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/config.tests/unix/compile.test

    r2 r561  
    1515INCLUDEPATH=""
    1616CXXFLAGS=""
     17
     18
    1719while [ "$#" -gt 0 ]; do
    1820    PARAM=$1
     
    2022    -framework)
    2123        LFLAGS="$LFLAGS -framework \"$2\""
     24
     25
     26
     27
     28
     29
     30
     31
     32
     33
    2234        shift
    2335        ;;
     
    5365cd "$OUTDIR/$TEST"
    5466
    55 make distclean >/dev/null 2>&1
    56 "$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "LIBS*=$LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
     67test -r Makefile && $MAKE distclean >/dev/null 2>&1
     68
     69"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
    5770
    5871if [ "$VERBOSE" = "yes" ]; then
    59     make
     72   
    6073else
    61     make >/dev/null 2>&1
     74    >/dev/null 2>&1
    6275fi
    6376
Note: See TracChangeset for help on using the changeset viewer.