Change-Id: Ide27d6e19a386ce1af5ee4b44b3366aaa430546c
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

remove the dependency from qtjsondb and qtgraphicaleffects
change qtdeclarative and qtquick1 dependency on it to optional

Change-Id: I6d1b60417d54c378c018d20d48fa6ce45776fbda
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>

qtfeeback currently has a hard dependency on qtmultimedia. qtfeedback
only uses multimedia in the mmk plugin. This change modifies the build
system only as all the required infrastructure changes in qtfeedback
are already present.

Change-Id: Ie9884dfd51fb040cde3e29247f1f51ea7f0bd637
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>

Change-Id: If96ee9b43cafbe3139234fa4ce822d282e7cff43
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Marko Niemelä <marko.a.niemela@nokia.com>

Qt Location has a soft dependency on qtjsondb.

Declare a new soft dependency on qtsystems.  This dependency is
dependent on whether location shifting support for China is
enabled.  By default it is not.

Change-Id: Id41451adb14e3c6cee0728ff343be85399fc4ac5
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

The experimental scripting feature of QtUiLoader was removed.

Change-Id: Ied8ae2210815642ff6cc19f3546829736d5edacd
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

Change-Id: I26aac3952e9e2dea05be7db6300a5f97b44fe6e7
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

not just using $$sort_depends(), so that the independent modules are
still sorted more or less logically.

Change-Id: I0c9630e338395997f7ee3cb40ef3028b8754af11
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

Change-Id: I3ca4e23052f93a57466045af1f76b3a36a7e2231
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>

Don't need to be platform specific about it.

Change-Id: I3ca981ec03b977961afaa18f09cde10b8b99c64e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

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>

Change-Id: Ie66430e661b54aea4d17eb6e2e0fb7a351d62d97
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

Not yet enabled by default.

Change-Id: I96d770c504281c8e6bb452d6742ea555c1c7405c
Reviewed-by: Jyri Tahtela <jyri.tahtela@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>

qttools uses both qtquick1 and qtdeclarative.

Change-Id: I3ec8ef3d770b029bec865a67aaaad3eb9db464d5
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>

Change-Id: I3afda68e1fa1dad4e264cea6e5afbd73d858c547
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

Change-Id: Ie168a1a450b8090d4aa934a21e991c67683ef5de
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>

Module cannot be compiled without this.

Change-Id: I1ea3bd6f21b389db0c758abebd6e851a77a1d682
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>

Change-Id: I179a5714a12144e6815d931fef9fbfcedee6c93f
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>

To replace qtquick3d.
This commit introduces qt3d, a follow-up commit will remove qtquick3d.

Change-Id: I3d1b46e7e1e32960351f02ec22a6e555203f988a
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@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>

Change-Id: I2491bc7401070763083a5f36c49ede1525626601
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jamey Hicks <jamey.hicks@nokia.com>
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>

Not yet enabled by default.

Change-Id: I07093f8770a7b2f05aa777cbf949a30478dacc67
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>

Change-Id: I54741996cb3dbfbb76dd0f864e4e72cd8b6bbd67
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@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>

Change-Id: Iaaaa634beef234d9b4d0bed56c4d4cab9459fbaa
Reviewed-on: http://codereview.qt-project.org/6280


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>

Change-Id: I8c62231ddbee1a731db7aa98a0796c8e81ee5a44
Reviewed-on: http://codereview.qt-project.org/5581


Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>

Not yet enabled by default.

Change-Id: I6f22e7d69743415ec8f9588a8621cd28ca6d8eda
Reviewed-on: http://codereview.qt-project.org/5580


Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>

Change-Id: Ib4e96ebc014d5f8651ab16184955645fbba16458
Reviewed-on: http://codereview.qt-project.org/5355


Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>

Change-Id: Ic34b6d270cdb754167977e9bda4c41a23819f31a
Reviewed-on: http://codereview.qt-project.org/5415


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>

Change-Id: I6fbdde1d28f3156aee0bf9caaae7a1e3b3a4392a
Reviewed-on: http://codereview.qt.nokia.com/4105


Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>

qtfeedback uses qtmultimediakit (in src/plugins/feedback/mmk), but
qt.pro was missing the dependency.

Change-Id: I1f54cc31cc9ac8bab2583f5afe4f9d7a13545844
Reviewed-on: http://codereview.qt.nokia.com/3900


Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>

Change-Id: I19e8fb731c22f50d27b1ca45e36b9884f33ca1f1
Reviewed-on: http://codereview.qt.nokia.com/3428


Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>

Not yet enabled by default.

Change-Id: I89a8cb8cc6da9aeeba217e3ab3c10459082a21ed
Reviewed-on: http://codereview.qt.nokia.com/3447


Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>