summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-08-31 15:43:40 +0200
committerQt by Nokia <qt-info@nokia.com>2012-09-11 09:35:28 +0200
commit78461c7ab214b6a29aa51f43e09b7af5d3cb3cb6 (patch)
treefde479f3cd0bcf1a8af55608c6d7166ec3a26842
parentb071ea317c6afcb3ce7ca74d47fa0557455a9bb7 (diff)
clean up syncqt invocation
it needs no special env variables any more Change-Id: I60a7ab6eabb9280b02cd510418c0842d05fc1306 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
-rwxr-xr-xconfigure2
-rw-r--r--tools/configure/configureapp.cpp5
2 files changed, 2 insertions, 5 deletions
diff --git a/configure b/configure
index 876dd07d60..c3c87ec457 100755
--- a/configure
+++ b/configure
@@ -3544,7 +3544,7 @@ if [ -n "$PERL" ] && [ -x "$relpath/bin/syncqt" ]; then
if [ "$OPT_SHADOW" = "yes" ]; then
"$outpath/bin/syncqt" $SYNCQT_OPTS "$relpath" || exit 1
elif [ "$CFG_DEV" = "yes" ] || [ ! -d $relpath/include ] || [ -d $relpath/.git ]; then
- QTDIR="$relpath" perl "$outpath/bin/syncqt" $SYNCQT_OPTS || exit 1
+ "$outpath/bin/syncqt" $SYNCQT_OPTS || exit 1
fi
fi
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 8396829748..ac2d56d768 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -3399,10 +3399,7 @@ void Configure::generateHeaders()
QStringList args;
args += buildPath + "/bin/syncqt.bat";
args += sourcePath;
- QStringList env;
- env += QString("QTDIR=" + sourcePath);
- env += QString("PATH=" + buildPath + "/bin/;" + qgetenv("PATH"));
- int retc = Environment::execute(args, env, QStringList());
+ int retc = Environment::execute(args, QStringList(), QStringList());
if (retc) {
cout << "syncqt failed, return code " << retc << endl << endl;
dictionary["DONE"] = "error";