diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-05-10 18:21:27 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-13 21:54:48 +0200 |
| commit | 6b38524bba4254c06ac5811fdde66bcafb49632f (patch) | |
| tree | befac2d7761d82bffcd6a716ead2a73f26798b61 /configure | |
| parent | 8a78225a337862225ffb598761a95c025107501b (diff) | |
get rid of syncqt wrapper scripts
instead, rename it to syncqt.pl and rely on qtPrepareTool()'s new
ability to correctly invoke it as a perl script even under windows.
the wrappers themselves have been trivial at this point, so there is no
added value in keeping them, either.
Change-Id: I77cf65edbcfaa48ed1900defe940d4eb4b82d5b9
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 13 |
1 files changed, 2 insertions, 11 deletions
@@ -2396,15 +2396,6 @@ if [ "$OPT_SHADOW" = "yes" ]; then [ -d "$outpath/bin" ] || mkdir -p "$outpath/bin" - # make a syncqt script that can be used in the shadow - rm -f "$outpath/bin/syncqt" - if [ -x "$relpath/bin/syncqt" ]; then - mkdir -p "$outpath/bin" - echo "#!/bin/sh" >"$outpath/bin/syncqt" - echo "perl \"$relpath/bin/syncqt\" \"\$@\"" >>"$outpath/bin/syncqt" - chmod 755 "$outpath/bin/syncqt" - fi - # save a pre-existing mkspecs/modules dir test -d "$outpath/mkspecs/modules" && \ mv "$outpath/mkspecs/modules" "$outpath/mkspecs-modules" @@ -3892,8 +3883,8 @@ fi # ----------------------------------------------------------------------------- # symlink includes -if [ -n "$PERL" ] && [ -x "$relpath/bin/syncqt" ]; then - "$outpath/bin/syncqt" -minimal -module QtCore "$relpath" || exit 1 +if [ -n "$PERL" ] && [ -x "$relpath/bin/syncqt.pl" ]; then + "$relpath/bin/syncqt.pl" -minimal -module QtCore "$relpath" || exit 1 fi # $1: input variable name (awk regexp) |