diff options
| author | Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> | 2012-04-18 15:35:24 -0700 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-19 11:07:25 +0200 |
| commit | c0d8d978027f495fed87f1f5cc07083a26025ee1 (patch) | |
| tree | 9be0f505841096e341c6446ab915da8b28fa2ad8 /configure | |
| parent | 21eb4578e5e0da44c87fc6a7d0d664c3584194e8 (diff) | |
-device: create qdevice.pri only when build tree is initialized
The build tree is not initialized when -help is passed to configure.
The mkspecs/ directory is not created and thus the mv fails results
with the following error:
mv: cannot move `.device.vars' to `/tmp/qtbase/mkspecs/qdevice.pri': No such file or directory
The solution is to create qdevice.pri just before we run config.tests.
Change-Id: Ie83018e27a03bb840d213aae8c963b0074e62bb4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -2429,15 +2429,6 @@ if [ "$CFG_RTOS_ENABLED" = "no" ]; then fi #------------------------------------------------------------------------------- -# write out device config before we run the test. -#------------------------------------------------------------------------------- -if cmp -s "$DEVICE_VARS_FILE" "$outpath/mkspecs/qdevice.pri"; then - rm -f "$DEVICE_VARS_FILE" -else - mv -f $DEVICE_VARS_FILE "$outpath/mkspecs/qdevice.pri" -fi - -#------------------------------------------------------------------------------- # tests that don't need qmake (must be run before displaying help) #------------------------------------------------------------------------------- @@ -3662,6 +3653,15 @@ if [ -z "$PKG_CONFIG" ]; then fi #------------------------------------------------------------------------------- +# write out device config before we run the test. +#------------------------------------------------------------------------------- +if cmp -s "$DEVICE_VARS_FILE" "$outpath/mkspecs/qdevice.pri"; then + rm -f "$DEVICE_VARS_FILE" +else + mv -f $DEVICE_VARS_FILE "$outpath/mkspecs/qdevice.pri" +fi + +#------------------------------------------------------------------------------- # tests that need qmake #------------------------------------------------------------------------------- |