diff options
| author | Matti Paaso <matti.paaso@digia.com> | 2014-04-08 17:38:23 +0300 |
|---|---|---|
| committer | Matti Paaso <matti.paaso@digia.com> | 2014-04-09 08:01:36 +0200 |
| commit | af9a8957c4109bf1ef2c711dc0c34d970d5fd073 (patch) | |
| tree | 8a8c2cc95a4b96190d6b1d10cc6b1e564790a266 /packaging-tools/mksrc.sh | |
| parent | cacea47d58b2fc012da8b37cbf01e22f78711e80 (diff) | |
Qtbase submodule ignored for synqt submodule version detection.
Submodule versions are detected during src build, and qtbase is a
special case and has to be treated as such.
Change-Id: I6234e5349a9c7a9943c5fdb91189f4aa26195c5f
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
Diffstat (limited to 'packaging-tools/mksrc.sh')
| -rwxr-xr-x | packaging-tools/mksrc.sh | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/packaging-tools/mksrc.sh b/packaging-tools/mksrc.sh index 19214e0f2..563c57f83 100755 --- a/packaging-tools/mksrc.sh +++ b/packaging-tools/mksrc.sh @@ -362,8 +362,10 @@ 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) + if [ $submodule != qtbase ]; then + RESULT=$(grep "MODULE_VERSION = " $PACKAGE_DIR/$submodule/.qmake.conf) + QTSYNCQTVER=$(echo $RESULT | cut -d ' ' -f3) + fi echo " - Running syncqt.pl for $submodule with -version $QTSYNCQTVER" if [ $submodule = qtwebkit ]; then SYNC_PROFILE_DIR=$PACKAGE_DIR/$submodule/Source @@ -373,9 +375,10 @@ 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) + if [ $submodule != qtbase ]; then + RESULT=$(grep "MODULE_VERSION = " $PACKAGE_DIR/.qmake.conf) + QTSYNCQTVER=$(echo $RESULT | cut -d ' ' -f3) + fi echo " - Running syncqt.pl for $REPO_NAME with -version $QTSYNCQTVER" $CUR_DIR/../qtbase/bin/syncqt.pl -version $QTSYNCQTVER -outdir $PACKAGE_DIR $PACKAGE_DIR fi |