| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
coin/platform_configs/default.txt
coin/platform_configs/qt5.txt
Change-Id: Id82a13a6b2fe6db60c286e470396298c08e363b8
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
instead, re-use the (also custom) 'project' property with the magic
value '-' to flag modules which contain no project files at all.
Change-Id: I33163c098852e1b79ad698115aac98217efe1157
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
.gitmodules
Change-Id: I5b4d96eedbbc228d61d7c62ff077c05a4fb70928
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
only examples use webp from qtimageformats.
Change-Id: I6fb0f21800761b9ddaaf55e250cdd8926800aac7
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
http(s) needs that.
Started-by: Alvaro Denis <denisacostaq@gmail.com>
Change-Id: I1373191d17586eae67bc49c3a83d1dc32b59f988
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
|
|/ /
| |
| |
| | |
Change-Id: I6989e17a9b33cf69863ce80fb1b1011d2223f951
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
.gitmodules
qt.pro
Commit ed8f84f149f6901cbca50d145b25fe5f43a2d54c (webengine needs tools)
together with commit 5656b4848e8c8bf60274c36094dede63aa93e89b (webkit
needs webengine) creates a circular dependency with qttools also
depending on webkit. So this commit breaks it by swapping the
serialization order between webkit and webengine.
Change-Id: I36309908adb754072495e02785ad158f8b389548
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
linking both at the same time requires more than my 16GB of RAM, so
introduce a .gitmodules field which serializes the two.
in practice, it is just interpreted as an optional dependency. the CI
system won't be taught about it, so this will not cause an unnecessary
serialization there.
Change-Id: I938537ebd3767a1184a5a31c4c026c70a05d499a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
The MapViewer example now uses qtquickcontrols2 sliders.
This patch adds the related dependency
Change-Id: I50db8e6355ee02b61dcd7a4230fafc1fd060fe3d
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|\ \
| | |
| | |
| | | |
Change-Id: I415772838a8434d00ad4ccebc8b1c4180e85880b
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
starting with 5.7, it optionally comes with a qt designer plugin.
Change-Id: Idcc81b2688a1c09d3273b07a1ec991b54903e94c
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | | |
Change-Id: Ie7e673d95b4930a93fc6d1a4aa86241061001bc2
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
qtgamepad will be officially supported with Qt 5.9
Change-Id: I3f941189881f2ab32ef10d4fff242e0d075798f3
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
|
|\| |
| | |
| | |
| | | |
Change-Id: Ic7dab06f6b6e6cf326df651151eade22429b997f
|
| |\|
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh
Change-Id: I10fcdfc0af68741d931f4732783bafdad2fffc4a
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
qtdeclarative has a runtime dependency, some tests rely on the svg
module being available, so in order to not reduce the test coverage,
revert this change.
I'd like to see a better/cleaner separation, but for the time being,
better coverage wins.
This reverts commit fbd782636b6ee413d2b6e8bca408263297194254.
Change-Id: I60d6b585e25e2e7c4f6ad705b754279968827842
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
|
| | |
| | |
| | |
| | | |
Change-Id: Ifd38a97f7b51138504e8d7ace030a175640bc216
|
|\| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This change also includes an update of the CI platform configurations to
the values that were previously in the CI source tree for builds of the
dev branch.
This is done within the same change as the merge to preserve atomicity.
Task-number: QTQAINFRA-1074
Change-Id: Ic47f7db3506ace4faca028b902d48cdb009c8495
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
.gitmodules
Change-Id: I749924de83f87e436448bf1287fe057e2fe4c45b
|
| | |\ \
| | | | |
| | | | |
| | | | | |
Change-Id: Ic9a6b04afe47529c4f953bace93e9c17d8c4d39d
|
| | | |\|
| | | | |
| | | | |
| | | | | |
Change-Id: I1c5420f9d0a192f55623b2d46aec7a15b7877609
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
There is no build dependency on QtSvg in qtdeclarative or qtquick1, so
don't recommend it for builds. QtSensors on the other hand has an
example that does need svg.
This does not change anything in the big picture, the svg module will be
built as always and svg files will be displayed. The change is the
ordering of builds (leave more room for parallelization).
Change-Id: I50e527e03a75742036d5f914611d0b34437a8e3a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
|
| |/ / /
| | | |
| | | |
| | | | |
Change-Id: I154feb1976da9853cb4de7e70a4962ad0a6b4067
|
|\| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
.gitmodules
Change-Id: I6f517c976152f2da390c556c7c9da08aaec4be90
|
| |\| |
| | | |
| | | |
| | | | |
Change-Id: I4060b0ddeb5a77c40b31e1ce1dafd2e878b48e12
|
| | |\|
| | | |
| | | |
| | | | |
Change-Id: Ibf285f0d67fc5125c1c7da6dfc5b62b834d34867
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Change-Id: Ia7b9d966777470642e0ee0ad3e9c82496ce93950
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
these repos were definitely _not_ branched for 5.7.
Change-Id: Ib31d4e07f2651cfba0a7d31a9db1f1a812061313
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
QtSystems is not a supported module at the moment, and the code in
QtLocation to utilize QtSystems is behind an #ifdef and destined for
removal.
Change-Id: Ide44f138638ccd751044c13c289f1e116641a23e
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Change-Id: I8ed4edcdf9eab48ec1ac278d3e8de38149b0fd8d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
|
| |\ \ \
| |/ / /
|/| | |
| | | |
| | | |
| | | |
| | | | |
Note that this also contains the adjustment of the branch for the
latecomers qtspeech and qtnetworkauth.
Change-Id: Ia77eb4d47a6ad66cb35e50ae03af751f46a805a8
|
| | | |
| | | |
| | | |
| | | | |
Change-Id: I6e8c8e91b7e17efa93b24e8026fa3f340bd10e9d
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Change-Id: I4cd81725d0aec29ff3252a84504a81a44d1b60eb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
|
|/ / /
| | |
| | |
| | |
| | |
| | | |
Change-Id: I144109a45bece4b2283c24ad7aae64c098f86963
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
|
|\| |
| | |
| | |
| | | |
Change-Id: I5ed83c8f42be099c545dfdcc96a34f7d33cfcda7
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
.gitmodules
Change-Id: Ibb7ae7927cfd3371bdb77d88df409e6982e43985
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The right term is "ignore" in order to ignore the module, not "ignored".
Change-Id: Idd4a887834fc98fffb2b9e8385308aa676ba3adf
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
It was agreed at the Qt Contributor Summit 2015 that QtQuick1 will be
removed completely from the packages and not even compiled during
qt5.git integration.
Enginio is also removed from 5.7.0 so ignoring it as well
Change-Id: I80ac88d28f811fbf731e33d4d4353a249ad6d29a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
| |/ /
| | |
| | |
| | | |
Change-Id: I3457cdb3ec2a645fb542039a62e6d107e1bbb812
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
qtquickcontrols2 is not in preview state anymore for Qt 5.7.
Change-Id: Ib9d3616e7605beabb9bb9f0b0cb1b79a8d499ebd
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: I20602133a2156b162e99432f868e4925469c7ff5
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
In Qt 5.7 enginio is obsolete and Qt3D addon, not TP anymore
Change-Id: I019f76162cfcc853b542695245a983f151f1b072
Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
|
| |\|
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
.gitmodules
Change-Id: If63e4f4f7d9a7ddba01d4e621fe6bfbc60838d26
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
.gitmodules
Change-Id: Ic9c8564006c2722f925700f09ff42da3e912f580
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Introduce new "deprecated" value for status attribute.
We have two flavors of big source packages we need to produce:
qt-everywhere-* which needs to include:
- essential
- addon
- preview
- deprecated (e.g. qtscript and qtenginio for Qt5.6 release)
Installer only specific source package:
- essential
- addon
The rest (deprecated, preview, ...) need to be shown as split src
packages in the installer.
The above leads to the following changes:
qtscript: addon -> deprecated
Needs to be part of big src packages but excluded from installer
specific big source package.
qtenginio: obsolete -> deprecated
We can't exclude this module from qt-everywhere src packages.
qtwayland: preview -> addon
Needs to be part of installer specific big src package and the
module status is not preview anymore.
Change-Id: I52e10629bf81860f56ebc4ce9d395e0ca54c4264
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
QQC2 depends on qtgraphicaleffects.
Change-Id: I6cc53d46cf9f4a140dff570801f13556da0d3961
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
| |\ \ \ |
|
| | |\| |
| | | | |
| | | | |
| | | | | |
Change-Id: I2bc1389ece7f12efc334f0292edbbea837f9adc2
|
| | | |\|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
.gitmodules
Change-Id: Ic3c425211f24b0dc3a341cac7d9fd9d0b7edac03
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
all repos which are released (whichever way) need release branches.
and vice versa.
also, it needs to be the *right* release branch.
Task-number: QTBUG-50695
Change-Id: Id7b5d106d2d9bdf70e9d5276e205a3c7ea827144
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
|