Commit Graph

566 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
bd1716005a Updated submodules.
Change-Id: Ied65966d5d176f5d354b17a8fa1f50fead14ccaa
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-09-03 20:14:21 +02:00
Christian Strømme
5fc7879313 Splitting up the README files
Moved git related information over to README.git,
and polished the README file slightly.

Change-Id: I863e2c2ef9c2020964185e96ddb87a05d82c30a6
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-09-03 07:02:20 +02:00
Kai Koehne
3913643642 README: Fix "Building Qt 5 from Git" link
Building_Qt_5_from_Git is a redirect to the version with '-' nowadays.

Change-Id: I48e7919c54af4adfb478ea64c93c844b107fbc4e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-08-31 13:55:57 +02:00
Qt Submodule Update Bot
ed65966d5d Updated submodules.
Change-Id: I5a109341ca30e1914732304a15c11a04f61d380f
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
2012-08-29 02:15:24 +02:00
Simon Hausmann
877cec0228 Fix make install with WebKit
Avoid running "make install" through build-webkit and therefore risk
accidentally rebuilding the lot. We call build-webkit either with --release
or without, but we never pass --debug. Therefore the build directory is
always WebKitBuild/Release.

This is a stop-gap for the Qt 5 beta. After the release we'll get rid of
qtwebkit.pri altogether and WebKit will be built with just qmake and make.

Change-Id: I21ff7ef8420b67cf466d5bca5efd7a1245bf4131
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
v5.0.0-beta1
2012-08-28 13:02:06 +02:00
Lars Knoll
f4f66ff107 Updated submodules.
Change-Id: I8e407c602cda9c30eda458b0aacb7465787f22c4
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-08-28 13:01:56 +02:00
Lars Knoll
725a51b1d8 Remove qtjsondb from qt5.git
The jsondb module has been ongoing research work. But it won't be done
in time for Qt 5.0, and is currently also less relevant. It's also
currently not being actively worked on. So let's remove it
from the list of modules compiled with qt5.git and keep it as
research.

The module can still be compiled stand-alone on top of the Qt essentials.

Change-Id: I6fd4524cae43b803a842788ff22a7525dc7bc0e6
Reviewed-by: Yuchen Deng <loaden@gmail.com>
Reviewed-by: Kevin Simons <kevin.b.simons@gmail.com>
2012-08-28 07:42:17 +02:00
Simon Hausmann
f00429b71a Disable WebKit2 for the Qt 5 beta
Disable all of WebKit2 until https://bugs.webkit.org/show_bug.cgi?id=94914 is fixed.

Change-Id: Iffc11efdba7c2c6ad4fe92437c28c77fd5d5a2bf
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-08-27 12:13:42 +02:00
Qt Submodule Update Bot
5a109341ca Updated submodules.
Change-Id: Id20cb51b5d6b7aa239becf2dda1e49f89c0b5c24
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
2012-08-27 00:53:36 +02:00
Lars Knoll
016d5d856f Update qtbase submodule.
Change-Id: Ifdadb7a8a25c6845cc775aea3f3f4d1af516f2a1
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-08-26 08:59:32 +02:00
Qt Submodule Update Bot
d20cb51b5d Updated submodules.
Change-Id: Ic0036e77b2b6700a6f177e4dbf07feec4d6b7167
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
2012-08-25 17:18:17 +02:00
Lars Knoll
93dbfad341 Updated submodules.
Change-Id: I077d126ef7a7b6490a625c971f72357614aeeb3f
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-08-24 20:56:11 +02:00
Qt Submodule Update Bot
c0036e77b2 Updated submodules.
Change-Id: I1fdd777ae919214aac4f3f4951439739eb65644c
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-08-24 05:46:45 +02:00
Lars Knoll
3ad7be1929 Updated submodules.
Change-Id: I36e3af2d6a1b8727754e705e470f4d541cb110a0
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-08-23 22:04:33 +02:00
Simon Hausmann
ec77419ac8 New WebKit snapshot with various build fixes
Include make install on Windows (prospective), build on OS X 10.6 and
without QML2

Change-Id: I4e0448287af203d6a391c17b73ad1ba45dd7a164
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2012-08-23 17:14:33 +02:00
Qt Submodule Update Bot
1fdd777ae9 Updated submodules.
Change-Id: I25ca35fc58f272d17bde1e97d055762c2075daeb
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-08-23 02:17:17 +02:00
Simon Hausmann
002f18fd52 New WebKit snapshot with 64-bit MSVC build fix
Change-Id: I8d62d99047e5516f235c9f02769f6780b8c2b82a
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2012-08-22 13:39:23 +02:00
Lars Knoll
2a5067e6cc Updated submodules.
Change-Id: Ifbf37f388c053bf377b04a2a19fe0da8e3e257b1
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-08-21 23:36:17 +02:00
Simon Hausmann
9867c4af7b New WebKit snapshot
Includes build fixes for newer Qt 5

Change-Id: Ib32a0c6ef2b3b3891cb51104dc089597876566fa
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2012-08-21 16:03:42 +02:00
Qt Submodule Update Bot
25ca35fc58 Updated submodules.
Change-Id: I5d79b1f86dc3b073e6ca5565cd5676debd6ebe29
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-08-20 13:15:21 +02:00
Simon Hausmann
4541cd9f60 New WebKit snapshot
Fixes build issues with qwindowsysteminterface header file moves and
removes need for extra patches on top of WK1 MSVC build.

Change-Id: Iebf4e1727a79f8b9c857f7270ee2341eca8d9985
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2012-08-12 09:33:44 +02:00
Qt Submodule Update Bot
5d79b1f86d Updated submodules.
Change-Id: I263f260d580b7d66ee67419ecbab777b86227d99
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-08-08 15:29:41 +02:00
Lars Knoll
1117d4da2c Remove docgallery from qt5.git
The document gallery has been pretty much unmaintained for a year
now and the only backends we have are for tracker (ie. the N9),
the deprecated jsondb client API and the simulator. it doesn't
work anywhere else currently.

Change-Id: I5c12e23be7ed8862e891e996fbd6191e79f4fdef
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
2012-08-06 13:45:32 +02:00
Qt Submodule Update Bot
263f260d58 Updated submodules.
Change-Id: I05561273d53f0c197f528183fa0e6be09b8e3c0c
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-08-02 07:09:41 +02:00
Qt Submodule Update Bot
05561273d5 Updated submodules.
Change-Id: I742353c43c52e58f4a7f21c721c43b62c46d6e5b
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-08-02 00:32:15 +02:00
Qt Submodule Update Bot
742353c43c Updated submodules.
Change-Id: If7f4b927e892a034697729dd0818211ef2487b3f
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-08-01 03:53:40 +02:00
Qt Submodule Update Bot
f7f4b927e8 Updated submodules.
Change-Id: Ie19caf122b2dd4d29119fb4d0367b1cf504c594c
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-07-31 09:36:25 +02:00
Lars Knoll
5fb5e0dfc7 Remove phonon as discussed on the mailing list
phonon's upstream is in KDE's repositories and the port
to Qt 5 on qt-project is not maintained. So it's only
logical to remove it. KDE frameworks 5 will hopefully
provide a phonon module for Qt 5 again in the future.

Change-Id: I30189d921913868f2253841648ba57b2aaf3650c
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
2012-07-30 17:23:22 +02:00
Simon Hausmann
898848326a New WebKit snapshot with prospective Mac OS X Mountain Lion build fix
Change-Id: I1b526d3113cc99123758259b0c632512199c2648
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2012-07-30 11:41:41 +02:00
Simon Hausmann
ec904560e7 New WebKit snapshot that follows latest Qt API changes
Change-Id: I526701439f1768681b6b3424f07f3a5931aae1eb
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2012-07-24 17:08:04 +02:00
Simon Hausmann
65079e2706 New WebKit snapshot with better configure tests
Change-Id: I6de43b46f6d62a2dc68ef196bee60f6a79e743fa
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2012-07-23 09:34:26 +02:00
Laszlo Papp
654fcc335c Follow the protocol requests for webkit (special treatment for internal)
It is currently not possible to successfully run the init-repository script with
certain protocols, like "http", since those requests does not apply for
qtwebkit. Hence, the cloning of qtwebkit fails behind the corporate rules which
is against the original purpose of those command line options.

If the requested protocol is "internal", then the replacement of qtwebkit
should still be excluded since that would potentially cause breakages.

Change-Id: I738738f1c367cf1b4f18ffed05f37715a78e94ae
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-07-19 15:56:54 +02:00
Qt Submodule Update Bot
e19caf122b Updated submodules.
Change-Id: I2b4b350459cfab4638b5fd5b276f0b0d206120c8
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-07-19 15:55:50 +02:00
Qt Submodule Update Bot
2b4b350459 Updated submodules.
Change-Id: Id5fe783fda5471f3244c8c871cb0eb7f603c2458
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-07-19 06:15:55 +02:00
Qt Submodule Update Bot
d5fe783fda Updated submodules.
Change-Id: I1e7d6ecc9d7834f134a6050bc16f3245208b12a6
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-07-18 19:11:45 +02:00
Simon Hausmann
c9fd867234 New snapshot that should fix the recently introduced rendering issues
Change-Id: Ie41f043dbe1693a620b1b03a975056ee0802adb1
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2012-07-18 14:04:30 +02:00
Rohan McGovern
34f300fd4b init-repository: fixed incorrect example for --mirror option
The full gerrit project name (including e.g. 'qt/' prefix) is appended
to the mirror. The previous example implied that only the last portion
was appended.

Change-Id: I6313427edc8e3dac0e9819ebec9de1d71763e07f
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Reviewed-by: Laszlo Papp <lpapp@kde.org>
2012-07-18 07:38:00 +02:00
Qt Submodule Update Bot
1e7d6ecc9d Updated submodules.
Change-Id: If3e608ac5908ec87daf9ec5fabbb53131215ca6e
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-07-17 01:12:09 +02:00
Simon Hausmann
bb7e88b0fb New WebKit snapshot with more Windows build fixes
Change-Id: I1945e611879ad24824db31d3fa208cf05cd5da00
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2012-07-16 16:19:47 +02:00
Qt Submodule Update Bot
f3e608ac59 Updated submodules.
Change-Id: Ib8aa817f803d8cb96e76c9f5ada24a6c5c8439ae
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-07-16 07:34:27 +02:00
Qt Submodule Update Bot
b8aa817f80 Updated submodules.
Change-Id: Ife4e459e44de1a90eb14498604e112d4ead4cb45
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-07-12 00:12:19 +02:00
Simon Hausmann
1d63be4b88 New WebKit snapshot that contains fixes needed after qtbase buildsystem changes
Change-Id: Ie9fc20e45b649422065da870dcd644e0b7497093
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2012-07-11 14:31:08 +02:00
Aaron McCarthy
107515b047 Add soft dependency on Qt Multimedia to Qt Location.
The Qt Location mapviewer example makes use of Qt Multimedia.

Task-number: QTBUG-26468
Change-Id: Ifa6e71ef582e32866567ca318903e2359248a3d0
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-07-11 08:59:38 +02:00
Qt Submodule Update Bot
fe4e459e44 Updated submodules.
Change-Id: I15426edcf0b62b2ec8ed114c2d5296f3b9d9d6f6
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-07-11 05:19:15 +02:00
Qt Submodule Update Bot
15426edcf0 Updated submodules.
Change-Id: I30214b8ee280d9845928ea867e0d7ab6f4adf70e
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-07-11 00:20:29 +02:00
Qt Submodule Update Bot
30214b8ee2 Updated submodules.
Change-Id: I9e7d0c7a0d3ce5f15c48d3884dab10fc3026c160
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-07-10 00:22:18 +02:00
Qt Submodule Update Bot
9e7d0c7a0d Updated submodules.
Change-Id: Iaf77a620f74fa17a3b072356b2a5a1647bfad83b
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-07-09 03:24:44 +02:00
Qt Submodule Update Bot
af77a620f7 Updated submodules.
Change-Id: I7e062e5d1ac6d8cce52e66b566fcc64480f5b377
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-07-06 07:56:18 +02:00
Qt Submodule Update Bot
7e062e5d1a Updated submodules.
Change-Id: Iec8eecbaf8909e9d79921955cedd4417b2f0b4d4
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-07-05 08:05:58 +02:00
Qt Submodule Update Bot
ec8eecbaf8 Updated submodules.
Change-Id: Ic6db6da949fb476b6623de5f8d5a57f64dde8de3
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-07-05 01:00:29 +02:00