Currently there is a soft dependency on qtsvg that causes a build of
qt5 to have unknown build order for qtsvg and other modules. This
change makes it a hard dependency if the qtsvg module is available.
Change-Id: Ic58a63f3f5f1d813ba832455c1ad3af41599926b
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Currently there is a soft dependency on qtjsondb. This change makes it
a hard dependency.
Change-Id: Iba29c91093c3c6c67c4121f6f220e62686708040
Reviewed-by: abcd <amos.choy@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Aaron McCarthy <aaron.mccarthy@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>
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>
At one time qtscript was required, but no longer.
In any case it builds fine without.
Change-Id: I43a3862673a4db4ef7145056101b2c7639dd2c3f
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: David Laing <david.laing@nokia.com>
The contents of QtMultimediaKit are being placed in QtMultimedia.
After this commit integrates, any dependent modules can be updated,
and then another change to remove QtMMK from Qt5 can be done.
Change-Id: I466df08ef1e764fae9056a61a51b82cab8633244
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
This reverts commit a507ff6241d8d22d4405a445fdbd16f32f1e3cde
This commit is counterproductive at least until qtwayland follows
a few more modularization requirements (e.g. .pro file named
`qtwayland.pro')
Change-Id: I5b9e6283eef9aaf1cdc3b71823181eaab1f9f3a7
Reviewed-on: http://codereview.qt-project.org/5681
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
This commit updates all applicable submodules past the merge of the
refactor branches.
Dependencies for qtlocation and qtdoc in qt.pro were fixed to match
the latest dependencies in those modules.
Change-Id: I0000000000000d80ddaf92f258714ab4a2750cb7
Reviewed-on: http://codereview.qt-project.org/5109
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
These modules are working and maintained, so they should be enabled by
default. Otherwise problems may go undetected for longer than
necessary.
Change-Id: Id1c79e4c323a31533bf8a0c593431974048a3106
Reviewed-on: http://codereview.qt.nokia.com/2986
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
Since d410ad364ec0b8877797145c68a4d7c3c98ce1c0 in qtdeclarative,
qtscript is no longer required to build qtdeclarative. Remove the
dependency.
Change-Id: Ia1af0121ed05735c8dbec545b8dda30d3d37aa99
Reviewed-on: http://codereview.qt.nokia.com/2405
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Still useful to use init-repository because of all the other logic, such
as repository urls. More general than --no-webkit, although it is still
a valid convenience as the most common case.
Also makes qt.pro check for existence of modules, since it is no longer
certain that you'll have everything but webkit.
Change-Id: Iaaaa30e24e0a793218e2e307bdde56067760c513
Reviewed-on: http://codereview.qt.nokia.com/1258
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Some of the depends were referring to qmake targets and some of them
were referring to make targets. That's unnecessarily confusing. Make
them consistent.
For the sake of a uniform test procedure, it is cleaner to have
`make module-qtactiveqt' always working, but simply not building
anything on platforms where ActiveQt is not supported.
Without this, any test procedure for building Qt5 needs to be able
to know or determine that ActiveQt should only be built on Windows.
Reviewed-by: Jason McDonald
Change-Id: I3869bbacdc6598a764561a4b9f6042c49e6ffae8
