diff options
| author | Matti Paaso <matti.paaso@digia.com> | 2014-04-08 12:59:03 +0300 |
|---|---|---|
| committer | Matti Paaso <matti.paaso@digia.com> | 2014-04-08 14:28:26 +0200 |
| commit | cacea47d58b2fc012da8b37cbf01e22f78711e80 (patch) | |
| tree | e4e1d55fa6be5fdcd50de32ece7d8a068f0288f0 /packaging-tools/mksrc.sh | |
| parent | c29d598901eff32000de05471b3b2c2f6b327eff (diff) | |
Submodule version number parsed from .qmake.conf before syncqt.pl
For more info look:
https://bugreports.qt-project.org/browse/QTBUG-37791
Change-Id: I6553446d632903b90e87cf3ef5e4a405302b9bcb
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
Diffstat (limited to 'packaging-tools/mksrc.sh')
| -rwxr-xr-x | packaging-tools/mksrc.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/packaging-tools/mksrc.sh b/packaging-tools/mksrc.sh index 8e881e74e..19214e0f2 100755 --- a/packaging-tools/mksrc.sh +++ b/packaging-tools/mksrc.sh @@ -362,6 +362,8 @@ if [ $SKIPSYNCQT = no ]; then echo "Running syncqt.pl" if [ $SINGLEMODULE = no ]; then while read submodule; do + RESULT=$(grep "MODULE_VERSION = " $PACKAGE_DIR/$submodule/.qmake.conf) + QTSYNCQTVER=$(echo $RESULT | cut -d ' ' -f3) echo " - Running syncqt.pl for $submodule with -version $QTSYNCQTVER" if [ $submodule = qtwebkit ]; then SYNC_PROFILE_DIR=$PACKAGE_DIR/$submodule/Source @@ -371,6 +373,9 @@ if [ $SKIPSYNCQT = no ]; then $PACKAGE_DIR/qtbase/bin/syncqt.pl -version $QTSYNCQTVER -outdir $PACKAGE_DIR/$submodule $SYNC_PROFILE_DIR done < $MODULES else + # determine submodule version + RESULT=$(grep "MODULE_VERSION = " $PACKAGE_DIR/.qmake.conf) + QTSYNCQTVER=$(echo $RESULT | cut -d ' ' -f3) echo " - Running syncqt.pl for $REPO_NAME with -version $QTSYNCQTVER" $CUR_DIR/../qtbase/bin/syncqt.pl -version $QTSYNCQTVER -outdir $PACKAGE_DIR $PACKAGE_DIR fi |