Conflicts:
	README
	qtwebkit-examples-and-demos

Change-Id: I23089d0f8a555d78e14f88bc55a48a78fe4a0e53

Change-Id: I38dc5b49


Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>

Change-Id: Ie78aad71


Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>

Change-Id: If52b3428957e1e4ce8163696eb818f5cac1c4d3a
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>

Change-Id: I80c8ed3c


Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>

this saves various trouble.
this syntax is supported since git 1.7.0.

Change-Id: I5bbc31c2ba01e7ec0129bf45b9f704c380bf11a3
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

Change-Id: I66b3df6c472715c6600a07fe4746bb11bad81a21
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Simo Fält <simo.falt@digia.com>

Change-Id: I18aaac18


Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>

Change-Id: I09c3d853


Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>

Change-Id: Icfbfb612


Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>

so that for example "-skip webkit" will also skip qtwebkit-examples.

Task-number: QTBUG-30307
Change-Id: I730830781ea5dabdccab88d19e82165f30dca8fe
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>

Change-Id: I6d08e322


Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>

Change-Id: Ifced9b81


Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>

Change-Id: I3e26038d


Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>

Change-Id: If618a972


Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>

Change-Id: I2f8a096c


Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>

Also adding qtsensors as part of the default modules and updating
its sha1.

Change-Id: I39f89f2d26725575d791d185aa452bc1f420a8da
Reviewed-by: David Faure (KDE) <faure@kde.org>

Change-Id: I696ab346


Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>

this allows for easy cloning and build system maintenance also for
modules which are currently irrelevant, thus hopefully keeping the
barrier to their revival low. it does not affect the casual developer or
the CI system, as init-repository will not clone these modules.

This (abstractly) reverts commits
41c3f2cb,
725a51b1 and
1117d4da

.

Change-Id: Iabc750642fc1c163f3ebc96cf6edaa9b04378094
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>

the list corresponds to the current contents of .gitmodules.
this will allow us to re-add more modules to the supermodule without
bothering people and the qt5 integration with unmaintained modules.

Change-Id: I8bc429fed8e4d1f729b375b302531472d3c4e267
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>

Change-Id: I231887b5


Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>

Change-Id: Id3d46ac7


Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>

Change-Id: Ib47a94b9


Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>

Change-Id: I3a3420b0


Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>

Change-Id: I5c752f16


Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>

Change-Id: Ib99b4bc0


Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>

Change-Id: Ice407c12


Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>

Change-Id: I585c525f


Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>

Change-Id: I3d960ec9


Reviewed-by: Liang Qi <liang.qi@digia.com>

Change-Id: I1e43a52dc31c1103c91f61e423c6850697bc3540
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>

Task-number: QTBUG-26697
Change-Id: Id3f091be5803d922e129e6c3b5d9dfcdd297d18f
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

this way adding a module actually becomes a one-liner

Change-Id: Ie31039d36e948094c3ec241758eaab330304b194
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

webkit now contains its own configure magic to disable itself.

Change-Id: Ibb962fac8ea6275400879c15f24d21f0f8dee855
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

Change-Id: Ib3ef11f4


Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>

Change-Id: I347949e2


Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>

Change-Id: I79193d2b


Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>

Change-Id: I2f43917c


Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>

-added basic information and links to wiki and qtbase/doc/README file.

Task-number: QTBUG-29057
Change-Id: I21d4dbaf7c1d03b63949af1fa303cb6fcbee8949
Reviewed-by: Johanna Äijälä <johanna.aijala@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>

Change-Id: I371d08eb


Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>

Change-Id: I319b198b


Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>