diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-01-30 20:14:29 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-03 16:48:33 +0200 |
| commit | 43663bc87daed85a3da7f2cfcbea26a5f1ead8dd (patch) | |
| tree | fecdd2d7e0dbe89b8e5da4cbd82134248b29a14a /configure | |
| parent | 0002464b46f3b42218933377d545e49fef65aa51 (diff) | |
| download | qtbase-43663bc87daed85a3da7f2cfcbea26a5f1ead8dd.tar.gz | |
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 <orgads@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 12 |
1 files changed, 0 insertions, 12 deletions
@@ -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" |