Includes one important autotest fix (tst_qicon).
Change-Id: Ia93fe84a050f7bb1cea6155ee10c101c6c36252b
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
This commit is equivalent to one of the normal automated updates except
qtjsondb was deliberately held back a few commits, as it has some
source-incompatible changes which require updates in most modules.
Change-Id: I339ae36d10a747d0aa705d8839f68e4ca6758c5b
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
As in the past, to avoid rewriting various autotests that contain
line-number information, an extra blank line has been inserted at the
end of the license text to ensure that this commit does not change the
total number of lines in the license header.
Change-Id: I5a62f56e4a36874b51c3258d02ae563e5810a422
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Qt3D had temporarily resided in the Qt5 repository under qtquick3d.
There is now a qt3d submodule which is compiling and testing correctly.
Qt5 had previously removed support for building the qtquick3d submodule
by default. This commit is the final step in cleaning up the previous
version.
Task-number: QTBUG-22098
Change-Id: I39fdbd7c58a0076c288d8c0570e892b5d0df4ff9
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Danny Pope <daniel.pope@nokia.com>
Dependency to other modules (qtpim, qtdocgallery, qtsystems)
is defined if qtjsondb is checked out.
Change-Id: I0e0abc8d30733b9d7c1fdc666cd064fe6809442a
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Disable qtquick3d by default and enable qt3d by default.
Make qtlocation depend on qt3d instead of qtquick3d.
qtquick3d still exists for now, and can be explicitly compiled if
necessary.
Change-Id: If1013a9361b17421217beffd2dc1864c5e8502f3
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: David Laing <david.laing@nokia.com>
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
Don't test for the existence of the mirror if the user didn't ask to
use a mirror.
Change-Id: Ib5565fa9a68ba6e22a4f7a179a0f00eb998da2aa
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Mirroring is set up for the repository now.
Change-Id: Iee21600f2222103e5777fa95e58a6c2ddaeea58f
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
We do not use submodules for our copy of v8 anymore.
Change-Id: I9da0f79d23336ee7efc074d4481d6bcdb0550bfc
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
This includes various build fixes with the latest Qt 5 and it also breaks
the circular dependency between qtwebkit and qttools.
Change-Id: Iab3d43caae748a74050cd73391aefef4057c3300
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
This allows init-repository to be used with servers mirroring only a
portion of the qt5 submodules. Any missing modules will be cloned from
the canonical upstream URLs.
Change-Id: I4b266edd2ec7d49126578b54eace6de6de629b56
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
This allows running 'init-repository --no-update -f' to initialise
and fetch new submodules without attempting to updating existing
submodules which may have new commits applied which may cause the
update to fail.
Change-Id: I48040bc42235231eec3bc85b643b688c8e8b4bd9
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
The repository pointed at is now significantly smaller and contains
a snapshot of WebKit only, excluding content like layout tests or
their platform specific results.
In addition the phonon dependency in qt.pro has been removed from WebKit,
as it is not accurate.
Change-Id: Ic2721435a6ce2328d11c1a8f5d9ce1881fc8ebb3
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
