This got merged accidentally.
This reverts commit 282899453d.
Change-Id: I1457513217e636aa54b43a1dc21b01443c798119
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
QtWayland adapted to new api in qtbase.
This reverts commit eba433c126.
Task-number: QTBUG-65600
Change-Id: If46f054adfb8a2db0d82acbd07cb39b2f512530e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
qtbase changed API, qssize_t was changed to qsizetype. In order for
qtwayland to update, qt5 needs to update first; but in order for
qt5 to update, qtwayland needs to compile.
Ignoring breaks cycle.
Task-number: QTBUG-65600
Change-Id: I978b0ed8dc86898ab1feb8b9cc47960e42095dfa
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Liang Qi <liang.qi@qt.io>
QtCanvas3D adapted to new internal api in qtdeclarative.
This reverts commit 146bda6468.
Task-number: QTBUG-64766
Change-Id: I709cb8856b674edc1a7d3217fdf68cbe8aca1608
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
QtWebView is not used in QtNetworkAuth. There is no need to recommend
the QtWebView module.
Change-Id: I2dbb9d4024ada9436725f4dac643574b558fb9ae
Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
This change will make the pure C++ libs of Qt3D be built even if
qtdeclarative is skipped.
Task-number: QTBUG-62256
Change-Id: I0cdf19a57d1d8eca065e19a21e88193c5dcb5eb6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
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>
Conflicts:
.gitmodules
qt.pro
Commit ed8f84f149 (webengine needs tools)
together with commit 5656b4848e (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>
This change also integrated latest dev branch of qtremoteobjects
and qtwebengine.
Conflicts:
.gitmodules
qtremoteobjects
qtwebengine
Change-Id: Ic6f97f43c55bdca5d8ac0481f3bb8a73429657b9
starting with 5.7, it optionally comes with a qt designer plugin.
Change-Id: Idcc81b2688a1c09d3273b07a1ec991b54903e94c
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
qtgamepad will be officially supported with Qt 5.9
Change-Id: I3f941189881f2ab32ef10d4fff242e0d075798f3
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
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 fbd782636b.
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>
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
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>
