diff options
| author | Iikka Eklund <iikka.eklund@digia.com> | 2014-04-21 11:29:48 +0300 |
|---|---|---|
| committer | Iikka Eklund <iikka.eklund@digia.com> | 2014-04-21 10:42:44 +0200 |
| commit | 8794e3c5250e370b604438546fd1221ee5f5e249 (patch) | |
| tree | 7261e9a13f36a4c624197410f11eb1ab4fde1c0c /packaging-tools/mksrc.sh | |
| parent | e8094f21f0f741a71c38f93dd4cbcea66dda7981 (diff) | |
Fix syncqt usage when parsing MODULE_VERSION from .qmake.conf
Change-Id: I5d26f26e85576e6c189e41a312652bc70941e360
Reviewed-by: Matti Paaso <matti.paaso@digia.com>
Diffstat (limited to 'packaging-tools/mksrc.sh')
| -rwxr-xr-x | packaging-tools/mksrc.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packaging-tools/mksrc.sh b/packaging-tools/mksrc.sh index 5cf4ea50c..c47abe2bd 100755 --- a/packaging-tools/mksrc.sh +++ b/packaging-tools/mksrc.sh @@ -364,7 +364,7 @@ if [ $SKIPSYNCQT = no ]; then while read submodule; do if [ $submodule != qtbase ]; then RESULT=$(grep "MODULE_VERSION" $PACKAGE_DIR/$submodule/.qmake.conf) - QTSYNCQTVER=$(echo $RESULT | sed s/^MODULLE_VERSION\s*\=\s*//) + QTSYNCQTVER=$(echo $RESULT | sed 's/.[^=]*=\(.[^ \t]*\)[ \t]*/\1/') fi echo " - Running syncqt.pl for $submodule with -version $QTSYNCQTVER" if [ $submodule = qtwebkit ]; then @@ -376,7 +376,7 @@ if [ $SKIPSYNCQT = no ]; then done < $MODULES else RESULT=$(grep "MODULE_VERSION" $PACKAGE_DIR/.qmake.conf) - QTSYNCQTVER=$(echo $RESULT | sed s/^MODULLE_VERSION\s*\=\s*//) + QTSYNCQTVER=$(echo $RESULT | sed 's/.[^=]*=\(.[^ \t]*\)[ \t]*/\1/') echo " - Running syncqt.pl for $REPO_NAME with -version $QTSYNCQTVER" $CUR_DIR/../qtbase/bin/syncqt.pl -version $QTSYNCQTVER -outdir $PACKAGE_DIR $PACKAGE_DIR fi |