diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-03 12:11:48 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-19 16:39:59 +0200 |
| commit | ab9f0e694fa9bd3538f3476e1dd0238c0267fa63 (patch) | |
| tree | 62d2d9ab78de97f0173272425e59f85db6b06ec4 | |
| parent | 8b822825c5066957622194acf0fc267a6bf473fd (diff) | |
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 <marius.storm-olsen@nokia.com>
| -rwxr-xr-x | bin/syncqt | 7 | ||||
| -rw-r--r-- | mkspecs/features/default_pre.prf | 4 |
2 files changed, 3 insertions, 8 deletions
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 diff --git a/mkspecs/features/default_pre.prf b/mkspecs/features/default_pre.prf index 4fa55ac645..8f150f399c 100644 --- a/mkspecs/features/default_pre.prf +++ b/mkspecs/features/default_pre.prf @@ -30,7 +30,7 @@ CONFIG = lex yacc warn_on debug exceptions $$CONFIG CMP_QDIR = $$QTDIR CMP_INSTALL_PREFIX = $$[QT_HOST_PREFIX] } - contains(CMP_QDIR, $$CMP_INSTALL_PREFIX):QTFWD = -qtdir $$QTDIR -module-fwd $$QTDIR/mkspecs/modules -developer-build + contains(CMP_QDIR, $$CMP_INSTALL_PREFIX):QTFWD = -module-fwd $$QTDIR/mkspecs/modules -developer-build unset(CMP_QDIR) unset(CMP_INSTALL_PREFIX) } @@ -38,7 +38,7 @@ CONFIG = lex yacc warn_on debug exceptions $$CONFIG qtPrepareTool(QMAKE_SYNCQT, syncqt) isEmpty(QMAKE_SYNCQT_OUTDIR): QMAKE_SYNCQT_OUTDIR = $$OUT_PWD - MSG = $$quote($$QMAKE_SYNCQT $$QTFWD -generator $$MAKEFILE_GENERATOR -outdir $$QMAKE_SYNCQT_OUTDIR $$_PRO_FILE_PWD_) + MSG = $$quote($$QMAKE_SYNCQT -qtdir $$[QT_HOST_DATA/get] $$QTFWD -generator $$MAKEFILE_GENERATOR -outdir $$QMAKE_SYNCQT_OUTDIR $$_PRO_FILE_PWD_) !silent:message($$MSG) system($$MSG) { # success! Nothing to do |