diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-02-28 15:02:01 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-28 12:07:28 +0100 |
| commit | 457606d12b13025970af2e36c640bb1f1e8f89d6 (patch) | |
| tree | d91756ab1526499a917a6dfd17dc7eaea4e6ad18 /configure | |
| parent | 3518db0bbecd2b10fac714e006f52d66a4f7a992 (diff) | |
configure: fixed qconfig.h symlink warnings
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>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -6757,9 +6757,9 @@ else [ -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" chmod -w "$outpath/src/corelib/global/qconfig.h" - for conf in "$outpath/include/QtCore/qconfig.h" "$outpath/include/Qt/qconfig.h"; do - ln -s "$outpath/src/corelib/global/qconfig.h" "$conf" - done + if [ ! -f "$outpath/include/QtCore/qconfig.h" ]; then + ln -s "$outpath/src/corelib/global/qconfig.h" "$outpath/include/QtCore/qconfig.h" + fi fi #------------------------------------------------------------------------------- |