| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Change-Id: Icd438b9da9af0275dd508186a265bc211d9d01ce
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
|
|
|
|
|
|
|
| |
it wastes time and causes output noise.
Change-Id: Ifee01150293431b3c528f30a46280bd142e30b22
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: I919c0332ff9f5ad1979de3105721c2ba5aacf634
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
|
|
|
|
|
| |
Change-Id: I1e275c54ea722d4f882cf329b65b749aa4d45fb2
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
|
|
|
|
|
| |
Change-Id: I5fdb4490cb85b3470bdbd81de9dccbe6bcb96460
Reviewed-by: Jani Heikkinen <jani.heikkinen@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>
|
|
|
|
|
| |
Change-Id: I74d7cf7e426ba4e1aa640ac986fbbe52d1e82897
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
|
|
|
|
|
| |
Change-Id: If16e291eea490110a9749b65fa4d21988376755a
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
|
|
|
|
|
| |
Change-Id: Iaa47c338f81e080e1fde4501e72ee48c9330e1be
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
|
|
|
|
|
| |
Change-Id: I2159de889d951926d780041338d948f4a1281aa3
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
|
|
|
|
|
| |
Change-Id: Ifefebb996cc9dcb2cc2b06f57315a4a679f96420
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
|
|
|
|
|
| |
Change-Id: I2c3556629bab77b013eabcf6535512e902837e40
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
- Renamed LICENSE.LGPL to LICENSE.LGPLv21
- Added LICENSE.LGPLv3 & LICENSE.GPLv2
- Removed LICENSE.GPL
Change-Id: I49f5a4bf3481d6cd712301092f5f20a5dac470cf
Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@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>
|
|
|
|
|
| |
Change-Id: Ie073b25926d4c538cb9f41d4c59d171857a60ede
Reviewed-by: Jani Heikkinen <jani.heikkinen@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>
|
|
|
|
|
| |
Change-Id: I8783ded72032dda42bc24a855e190e0a2e699b01
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>
|
|
|
|
|
|
| |
Change-Id: Ief1276f88837885637d0e60c90c4713bd12f6c85
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
|
|
|
|
|
| |
Change-Id: I7e3ef09eb437f700c6fe010ce44a711118e8bd75
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@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>
|
|
|
|
|
| |
Change-Id: I6ccb1f47aa3f394d6e2e80ffcd0dada345d1fea1
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
|
|
|
|
|
| |
Change-Id: I091f46c34c950237bdd5054367b5c26e4c291fad
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
|
|
|
|
|
| |
Change-Id: Iffab81d96aa4e91c14fe3ff888dd4323092a261e
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
|
|
|
|
|
| |
Change-Id: Icf05e7857b02db74c7309d796be7ef259cf83e37
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
|
|
|
|
|
| |
Change-Id: If4479c349b595d28e0dd4985259d7d1ed00bb966
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
|
|
|
|
|
| |
Change-Id: I000a16c22c4c3dc7d0e02aeb370454f386bb09f1
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
|
|\
| |
| |
| | |
Change-Id: Ib1694808847f26576cc3c7780bd1c6d3689a8a26
|
| |
| |
| |
| |
| | |
Change-Id: I620dc10e25cac7386182a6ff272b904f5f9f1a0d
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
|
| |
| |
| |
| |
| | |
Change-Id: I64f379141c59c193e3ebba5816495498c1ed0e64
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.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>
|
| |
| |
| |
| |
| | |
Change-Id: Ic9eb01ba38cca9c77a533f32d5f2f0519ec56aa3
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
|
| |
| |
| |
| |
| | |
Change-Id: I25acd00fedc81040b0b108120b21deedafcf7fa4
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
|
| |
| |
| |
| |
| | |
Change-Id: I055e2822456ad09cc939c628e4a86105eda5dade
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
|
| |
| |
| |
| |
| | |
Change-Id: I56a5eee34a20e5de06ee8b430afa5c32ca6b94c6
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
|
| |
| |
| |
| |
| | |
Change-Id: I2c0f1cfb71d44eed5fb4eaacc93d931e46df9512
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
|
| |
| |
| |
| |
| | |
Change-Id: I4fadcf5d88abca2ae886dd4483ca2838bfdbce19
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
|
| |
| |
| |
| |
| | |
Change-Id: Ifb66951776e8decb8784c80fb7ed02864253065b
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
|
| |
| |
| |
| |
| | |
Change-Id: I55e55c405f6e950dcc623b1f7d7faa09bc8c950f
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
|
| |
| |
| |
| |
| | |
Change-Id: I982ee75828244f44a1f27b4aa2d5a2a5dabbcd63
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
|
| |
| |
| |
| |
| | |
Change-Id: I06d2b3a720c1aa819e35ddd51c6cd5211d2748a6
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
|
| |
| |
| |
| |
| | |
Change-Id: Ib065abc7fd89c5766c5a060b295ea19154c02f64
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
|