lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-01 19:36:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
625 Commits 118 Branches 270 Tags
b9b8db07450bb61583a3e847d511e20f6a7e59bb
Commit Graph

625 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oswald Buddenhagen
b9b8db0745 fix argument quoting when invoking "proper" configure 
Change-Id: Idd22f7d267b83e1a4f2cc6df9994d82a5d361df7
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2012-11-14 05:51:43 +01:00
Qt Submodule Update Bot
2ad41f3ba7 Updated submodules. 
Change-Id: I371ae019fce042b40715196f7744cea1c525dbf6
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-11-12 22:02:41 +01:00
Qt Submodule Update Bot
371ae019fc Updated submodules. 
Change-Id: Icb530cbe807c4d973493034072e4a09988f3a676
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-11-11 11:41:03 +01:00
Qt Submodule Update Bot
cb530cbe80 Updated submodules. 
Change-Id: I8dfa5d43e1347ae5a884310145cb9b0c838bc42a
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-11-10 19:40:52 +01:00
Qt Submodule Update Bot
8dfa5d43e1 Updated submodules. 
Change-Id: I4ec68bcba5d8e93510407100220b8d5d54caae94
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-11-10 11:20:22 +01:00
Qt Submodule Update Bot
4ec68bcba5 Updated submodules. 
Change-Id: I7319eb06fd842b08a53e357b2ffe9a8af8569312
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-11-09 06:22:14 +01:00
Qt Submodule Update Bot
7319eb06fd Updated submodules. 
Change-Id: Ie605d1675e403023c9e5e7ec3ba51f6fb42a1a9e
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-11-08 17:18:07 +01:00
Qt Submodule Update Bot
e605d1675e Updated submodules. 
Change-Id: Ia6254526d84f43ad810e364fb3af1837c30f3da1
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-11-07 17:40:11 +01:00
Sergio Ahumada
7a9722d3ab Updated submodules 
Change-Id: Ic85275847cf5005ee4e3394c1ceced66ba80895c
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2012-11-07 11:46:40 +01:00
Simon Hausmann
76d59a3fa4 Manual update of qtbase from master for qt5.git 
Change-Id: I6649832b9a395cda862a032b910ed69479964895
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2012-11-06 15:55:11 +01:00
Qt Submodule Update Bot
a6254526d8 Updated submodules. 
Change-Id: I01b8ffb28fe160d3b5ac47605a31534366dfd79f
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2012-11-06 10:53:06 +01:00
Qt Submodule Update Bot
01b8ffb28f Updated submodules. 
Change-Id: I2b92b3ea1f9c2f7abd0a2e55513597a5d3b3886f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-11-05 20:09:22 +01:00
Qt Submodule Update Bot
2b92b3ea1f Updated submodules. 
Change-Id: Ia1f4d9db151183d2ec37a5f9d4bcf0edc21839e6
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-11-01 12:30:27 +01:00
Sergio Ahumada
0125076d12 Updated submodules. 
Change-Id: Ib672f1a1fa973d87b0c23c881f195ef2b4c6869a
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
 2012-10-30 16:21:37 +01:00
Stephen Kelly
41c3f2cb5f Remove submodules which are not part of Qt 5.0. 
Task-number: QTBUG-27736
Change-Id: I737515d2cfe687448a03b67ce9f2c14d108f2a1d
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2012-10-30 16:21:34 +01:00
Qt Submodule Update Bot
a1f4d9db15 Updated submodules. 
Change-Id: Ic0772fa7a5f5904ced225960897a512053d23a1b
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-10-26 18:44:56 +02:00
Simon Hausmann
71c071399a Minor WebKit update to fix 64-bit Windows build 
Just three patches on top that should fix the 64-bit build that uses
C-Loop LLInt for JSC.

Change-Id: I9dc87416dbf0ee3e3b47b46d6529dd951e5c15e0
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2012-10-25 16:08:34 +02:00
Qt Submodule Update Bot
c0772fa7a5 Updated submodules. 
Change-Id: If81bf2b5ee9af76fd053392d1504dbbbeea3e4e9
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-10-25 11:41:03 +02:00
Simon Hausmann
98a605eb6b Single update of QtWebKit/QtQuick1 module to include WebKitWidgets changes 
Change-Id: I6f6f74c68127ee552bfd008c9afd2f61b8305155
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2012-10-23 03:46:47 +02:00
Qt Submodule Update Bot
f81bf2b5ee Updated submodules. 
Change-Id: I0e169c8e8b8bc7c129bb1ef40a33c8345a2ca536
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2012-10-19 19:38:01 +02:00
Tor Arne Vestbø
0e1169ca2d Tweak name of Makefile for QtWebKit to just 'Makefile', not 'Makefile.WebKit' 
Change-Id: I8399f640d5e5f14b4453a97b543db602859d6278
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2012-10-19 19:37:52 +02:00
Qt Submodule Update Bot
0e169c8e8b Updated submodules. 
Change-Id: I34f1dbc74a893db80786a7723c6a90ff2cf7d7b7
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
 2012-10-15 15:19:50 +02:00
Qt Submodule Update Bot
34f1dbc74a Updated submodules. 
Change-Id: I21f9eaf60e83dd3b8376129c1d96bcdad943c4c9
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
 2012-10-15 03:06:59 +02:00
Qt Submodule Update Bot
21f9eaf60e Updated submodules. 
Change-Id: Ida8730bf218cde1186e8f8e3307c82b26fed1609
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-10-14 08:11:21 +02:00
Qt Submodule Update Bot
da8730bf21 Updated submodules. 
Change-Id: I749b83f337ec82eff305ed8ac85473ad984c84fa
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-10-13 23:51:35 +02:00
Qt Submodule Update Bot
749b83f337 Updated submodules. 
Change-Id: I508072fb031ffb6beea94c77d41b29bfedf3874f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-10-02 21:13:38 +02:00
Qt Submodule Update Bot
508072fb03 Updated submodules. 
Change-Id: Icd3a4676c81eb1096b3dbea9129bebf45e527b38
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
 2012-10-02 02:04:22 +02:00
Qt Submodule Update Bot
cd3a4676c8 Updated submodules. 
Change-Id: I008fb07a0f735a1416e6594737505becc671de39
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
 2012-10-01 14:52:13 +02:00
Qt Submodule Update Bot
008fb07a0f Updated submodules. 
Change-Id: Id3a55bf0aa240a26cedd2e8415f81849d6d65fc1
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
 2012-09-30 02:35:49 +02:00
Qt Submodule Update Bot
d3a55bf0aa Updated submodules. 
Change-Id: I58acd59fa661739b4bd3a39d85841f7bea61caa8
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-09-29 08:15:48 +02:00
Jonathan Liu
600b295f2c Revert "Check for a non-error, non-continue case." 
This reverts commit 6bd52260c8.
Running configure -help should not break builds by removing
.qmake.cache.

Change-Id: I9754ea891a445a9b67a1f9ad0adac85cb36338fe
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2012-09-28 18:19:12 +02:00
Qt Submodule Update Bot
58acd59fa6 Updated submodules. 
Change-Id: I8f9fcfdcb58075a211d1fb0de2fece6d5cb74dbd
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-09-28 13:01:26 +02:00
Qt Submodule Update Bot
8f9fcfdcb5 Updated submodules. 
Change-Id: I4865835418f8faaf3ab7635e07b790bc3b4d9cbd
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-09-27 21:02:49 +02:00
Simon Hausmann
e4d841490b Introduce dependency: QtQuick1 needs QtWebKit 
The QML1 WebKit integration is moved to the QtQuick1 module, so this
dependency needs to be expressed in qt.pro.

It is technically an optional dependency, because the module can be built
without, but if WebKit is available then it should be built before QtQuick1.

Change-Id: Iae69339827afe6449a7af8fd6ae7de62632f30ed
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2012-09-26 15:30:47 +02:00
Simon Hausmann
a2d6af491e WebKit update for MinGW build fix 
Change-Id: I5b541d144a91a8bebece62a6f3abd4108848ca39
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2012-09-25 20:53:47 +02:00
Iikka Eklund
4e87fe89ce Change copyrights from Nokia to Digia 
Change copyrights and license headers from Nokia to Digia

Change-Id: Ieac8fb85896427cd5e3c6d91698c455a0dc9e495
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
 2012-09-25 14:31:30 +02:00
Qt Submodule Update Bot
4865835418 Updated submodules. 
Change-Id: Ibf4c64ada0a1afe7bc8fdaf076b076c0e9b40fb0
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-09-24 20:48:32 +02:00
Simon Hausmann
58178a8a0e New WebKit snapshot with build fixes for latest qtbase 
Change-Id: Id44a58e47a0a715bf65b51c6a8d2e73ebb4a6766
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2012-09-24 13:08:58 +02:00
Qt Submodule Update Bot
bf4c64ada0 Updated submodules. 
Change-Id: I8fbf48fd93fb696b5255f6835872a9e83df5d706
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2012-09-24 13:08:53 +02:00
Simon Hausmann
6ccb808ef6 WebKit update 
This should fix the build errors that "looked" like errors from Qt3D
but were triggered through an incorrect QtWebKit module master header file,
as well as the supposed linking errors related to WebKit2.

Also disable the WebKit build if ICU is not available instead of breaking
the build when reaching WebKit.

Change-Id: I109b4152c081250c8950ef62dd7278129b716f76
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2012-09-21 16:45:16 +02:00
Oswald Buddenhagen
c0626490d1 don't tell people to add qtbase/bin to PATH 
there is no reason whatsoever to do this (any more).

Change-Id: Ib68c60ef137db0d68100f51a4efcaa27dd3c72e3
Reviewed-by: Yuchen Deng <loaden@gmail.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-09-21 16:45:11 +02:00
Oswald Buddenhagen
be16d21a80 delete build script 
the modularized build system is now good enough

Change-Id: Idcc3fb2b6d6201ad7ecbb8e91bd257530797762b
Reviewed-by: Yuchen Deng <loaden@gmail.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
 2012-09-21 16:45:06 +02:00
Oswald Buddenhagen
0e1c9d3724 remove traces of webkit build being claimed to be special 
Change-Id: I72a36c7aedf7f364a3bd53755af17b803c532cf2
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-09-21 16:45:02 +02:00
Oswald Buddenhagen
aa7ff01d60 remove outdated blurb about shadow builds being 2nd class citizens 
Change-Id: Iee86330dd182d346673b9b21f408d944709f2ce5
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2012-09-21 16:44:56 +02:00
Simon Hausmann
837c3e68a0 Fix path to Qt 5 WebKit mirror for Brisbane 
Point to the small module that contains snapshots of WebKit instead of
of to the repo that contains several gigabytes of history.

Change-Id: I96df293c8c6de76ea6e56836a0d6018c25f6bb0a
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-09-21 16:44:53 +02:00
Sergio Ahumada
23701ec556 Updated qtwebkit-examples-and-demos submodule 
Change-Id: I0860a4e43ee3fadb765835d22f51474b40b99c1a
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2012-09-21 16:44:48 +02:00
Simon Hausmann
138fb6e22e WebKit update with various build fixes 
Change-Id: I47639d78003214f3eafc1499ae35408fb39b5df0
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2012-09-18 20:30:25 +02:00
Qt Submodule Update Bot
8fbf48fd93 Updated submodules. 
Change-Id: I2e1a8b49f437a68e8be5f44351116aa4d9638994
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
 2012-09-17 13:47:16 +02:00
Qt Submodule Update Bot
2e1a8b49f4 Updated submodules. 
Change-Id: Ic1a3e0c2f2b9ecb16299a2e6d1f757e0c66fd1e7
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
 2012-09-15 23:25:05 +02:00
Thiago Macieira
c4c9ca640a Don't include init-repository and .gitmodules in the package either 
Even though qt5.git will not be packaged either.

Change-Id: I9bc02170dde1262aeb839741722d275bdb9e4b46
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
 2012-09-14 17:31:34 +02:00