From 43663bc87daed85a3da7f2cfcbea26a5f1ead8dd Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 30 Jan 2012 20:14:29 +0100 Subject: export QMAKESPEC to the project this makes it unnecessary to dump qmakespec to .qmake.cache and qmodule.pri. Task-number: QTBUG-22700 Change-Id: I678c7ee7df2512184b9cd06d7a3be8bbd0b0da15 Reviewed-by: Orgad Shaneh Reviewed-by: Joerg Bornemann --- configure | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 23bc420336..a631dc912b 100755 --- a/configure +++ b/configure @@ -5914,18 +5914,6 @@ CONFIG += dylib depend_includepath fix_output_dirs no_private_qt_headers_warning EOF -#dump the qmake spec -if [ -d "$outpath/mkspecs/$XPLATFORM" ]; then - echo "XQMAKESPEC = \$\$QT_BUILD_TREE/mkspecs/$XPLATFORM" >> "$CACHEFILE.tmp" -else - echo "XQMAKESPEC = $XPLATFORM" >> "$CACHEFILE.tmp" -fi -if [ -d "$outpath/mkspecs/$PLATFORM" ]; then - echo "QMAKESPEC = \$\$QT_BUILD_TREE/mkspecs/$PLATFORM" >> "$CACHEFILE.tmp" -else - echo "QMAKESPEC = $PLATFORM" >> "$CACHEFILE.tmp" -fi - # replace .qmake.cache if it differs from the newly created temp file if cmp -s "$CACHEFILE.tmp" "$CACHEFILE"; then rm -f "$CACHEFILE.tmp" -- cgit v1.2.3