1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

configure: fixed qconfig.h symlink warnings

Browse Source 
configure was unconditionally attempting to create two symlinks to
qconfig.h: include/Qt/qconfig.h, and include/QtCore/qconfig.h.

include/Qt doesn't exist any more, so this would always cause a
"No such file or directory" warning.  Remove that one.

include/QtCore/qconfig.h is usually created by syncqt now, so this would
cause a "File exists" warning.  Make that one conditional.

Change-Id: I8c6244dcbcf9765444f0d5c40c91a0ca192ecbcb
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
Rohan McGovern 2012-02-28 15:02:01 +10:00 committed by Qt by Nokia
parent 3518db0bbe
commit 457606d12b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

@ -6757,9 +6757,9 @@ else
[ -f "$outpath/src/corelib/global/qconfig.h" ] && chmod +w "$outpath/src/corelib/global/qconfig.h" [ -f "$outpath/src/corelib/global/qconfig.h" ] && chmod +w "$outpath/src/corelib/global/qconfig.h"
mv "$outpath/src/corelib/global/qconfig.h.new" "$outpath/src/corelib/global/qconfig.h" mv "$outpath/src/corelib/global/qconfig.h.new" "$outpath/src/corelib/global/qconfig.h"
chmod -w "$outpath/src/corelib/global/qconfig.h" chmod -w "$outpath/src/corelib/global/qconfig.h"
for conf in "$outpath/include/QtCore/qconfig.h" "$outpath/include/Qt/qconfig.h"; do if [ ! -f "$outpath/include/QtCore/qconfig.h" ]; then
ln -s "$outpath/src/corelib/global/qconfig.h" "$conf" ln -s "$outpath/src/corelib/global/qconfig.h" "$outpath/include/QtCore/qconfig.h"
done fi
fi fi
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------