AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clean up syncqt invocation

Browse Source 
it needs no special env variables any more

Change-Id: I60a7ab6eabb9280b02cd510418c0842d05fc1306
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
This commit is contained in:
Oswald Buddenhagen 2012-08-31 15:43:40 +02:00 committed by Qt by Nokia
parent b071ea317c
commit 78461c7ab2
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -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

5
tools/configure/configureapp.cpp
View File

@ -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";