From ab9f0e694fa9bd3538f3476e1dd0238c0267fa63 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 3 Apr 2012 12:11:48 +0200 Subject: move $QTDIR handling out of syncqt instead, always pass -qtdir (which, btw, is a slight misnomer - it should be -qtdatadir) with the correct path. this centralizes the relevant logic in default_pre.prf. Change-Id: Icc788d3f3e5f7b68b444e63e181efdea3b4ef160 Reviewed-by: Marius Storm-Olsen --- bin/syncqt | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'bin/syncqt') diff --git a/bin/syncqt b/bin/syncqt index a074ac71c2..03d7ea6525 100755 --- a/bin/syncqt +++ b/bin/syncqt @@ -83,12 +83,7 @@ our $quoted_basedir; # Make sure we use Windows line endings for chomp and friends on Windows. $INPUT_RECORD_SEPARATOR = "\r\n" if ($^O eq "msys"); -# try to figure out where QtBase is located -# normally the script location should be enough, if not fall back to -# QTDIR environment variable. If that doesn't work, later ask the -# user to use the -qtdir option explicitly. -my $qtbasedir = $ENV{"QTDIR"}; -$qtbasedir = dirname(dirname($0)) if (!$qtbasedir); +my $qtbasedir = dirname(dirname($0)); normalizePath(\$qtbasedir) if (defined $qtbasedir); # will be defined based on the modules sync.profile -- cgit v1.2.3