git-submodule init will simply not touch the already initialized
submodules. this is just fine, as we'll overwrite the config entries
with our own urls (and remove the obsolete ones) afterwards anyway.
Change-Id: I6372bd48be9792e456899dc829226921990140c4
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
it's backwards to keep this in the script itself.
Change-Id: I4248ba3fef984bdff5d034cb2e6db6cae3209d68
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
we now have everything we need to construct it on the fly.
Change-Id: I129e49bbcf46428d0fcef31ab8188df9d6a4026c
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
keeping a redundant copy in the script is plain backwards.
Change-Id: Ibdd1bab9d2cb5af7d7747d5caa2afc7d6e7571ad
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
instead of doing multiple passes over the submodules, do everything in
one go.
as a bonus, as the internal structure uses exclusion entries in the
module list, we can make that feature user-accessible just as well.
Change-Id: I8bfb30c8051a9150f92e2e124ff52f64e3efe03c
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
it was a vestige from the times when the submodules had absolute urls
pointing at git://gitorious.org. as we now use relative urls, things
work just fine without that option.
Change-Id: I5e93ff8cd2497a27cfbdd53dbcf9db3cd0c4cd1d
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Since git 1.7.8 the $GIT_DIR of the submodule can be a reference to the
super-module's $GIT_DIR/modules/<name>/
Test for existence instead of testing for a directory before attempting
a git clone there.
Change-Id: Ic539e770067da1417a2ad374c21253212473abe6
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
qtwebkit is listed as an optional dependency for
qtwebengine to ensure that qtwebkit and qtwebengine
are not linked in parallel on the CI system.
Otherwise we could run out of memory.
Change-Id: Ib80d72407df03037c928d99f55c8e04e98e506d9
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
QtWayland is going to be released with Qt 5.4.
Change-Id: I9a9bead92c6c34324510007ad844c9fdf633690d
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
This is required to prepare the merge of the integration patch.
The QtWebChannel and QtWebSockets lines in qt.pro are moved such
that they occur before their first use in QtWebKit.
Change-Id: Ie8137da57827776fe7b1434538df6b08108b0349
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Unless we do so, doing git submodule init in a submodule would use the
currently checked out version of its .gitmodule instead of the one of
its pinned SHA1.
Change-Id: I88de421c8d24748dcaa5334c82da2aac4b12b2ad
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
This allows repositories that have a different submodule name than their
URL file part to be using the mirror.
i.e. qtwebengine's src/3rdparty mapped to .../qt/qtwebengine-chromium.git
Change-Id: Ibea9cb9db701c95fc6f8b0e2457de74823aeeba5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This also updates the qtwebsockets revision since
that's needed to compile.
Change-Id: I9f3564c78d08abdca73ce395f31b3031a829e502
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
it's a soft dependency and it appears to be properly checked in the
subprojects.
Task-number: QTBUG-38616
Change-Id: I5ada1f91247ba3668015e95d6da9c5996f1a138c
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
QtLocation no longer depends on Qt3D.
Change-Id: I0418dcc93a97722948bddcdd4f754914d7eaa019
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
