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

678 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oswald Buddenhagen
730e330068 renamed qtwebkit-examples-and-demos => qtwebkit-examples 
Change-Id: I66b3df6c472715c6600a07fe4746bb11bad81a21
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Simo Fält <simo.falt@digia.com>
 2013-05-01 06:12:16 +02:00
Qt Submodule Update Bot
b25fcb31a7 Updated submodules. 
Change-Id: I18aaac18064518a3bf03ac624ff0295817fc9418
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-04-29 23:17:16 +02:00
Qt Submodule Update Bot
18aaac1806 Updated submodules. 
Change-Id: I09c3d8537e5dc8a7457cd7d7a0b284a0acf51069
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-04-21 18:45:04 +02:00
Qt Submodule Update Bot
09c3d8537e Updated submodules. 
Change-Id: Icfbfb612338958b30f0abe2d00c919de693f10c9
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-04-20 02:49:49 +02:00
Oswald Buddenhagen
7b034fec34 skip modules whose mandatory dependencies are missing 
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>
 2013-04-18 19:09:07 +02:00
Qt Submodule Update Bot
cfbfb61233 Updated submodules. 
Change-Id: I6d08e322c7e5f8d32b4a951e47b4288c2654c64c
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-04-18 12:43:32 +02:00
Qt Submodule Update Bot
6d08e322c7 Updated submodules. 
Change-Id: Ifced9b8199a57c0e29fc2029a5705d01f023f673
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-04-17 18:38:52 +02:00
Qt Submodule Update Bot
fced9b8199 Updated submodules. 
Change-Id: I3e26038d5c8cf10900e30dee4b3780ea2dce5f68
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-04-17 13:18:36 +02:00
Qt Submodule Update Bot
3e26038d5c Updated submodules. 
Change-Id: I2f8a096c9cf722978f7995097fd2807445898f58
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-04-05 18:38:42 +02:00
Sergio Ahumada
80c8ed3c21 Add new modules (qtquickcontrols, qtserialport and qtx11extras) 
Also adding qtsensors as part of the default modules and updating
its sha1.

Change-Id: I39f89f2d26725575d791d185aa452bc1f420a8da
Reviewed-by: David Faure (KDE) <faure@kde.org>
v5.1.0-alpha1 		2013-04-04 17:25:51 +02:00
Oswald Buddenhagen
66ed87fc67 re-add a bunch of modules 
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
41c3f2cb5f,
725a51b1d8 and
1117d4da2c.

Change-Id: Iabc750642fc1c163f3ebc96cf6edaa9b04378094
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-04-03 20:47:18 +02:00
Oswald Buddenhagen
ec783bb21e clone only a specific subset of repositories by default 
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>
 2013-04-03 20:47:07 +02:00
Qt Submodule Update Bot
2f8a096c9c Updated submodules. 
Change-Id: Id3d46ac7b315145cfce399450e5f99a2c16dd41b
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-03-27 16:01:20 +01:00
Qt Submodule Update Bot
d3d46ac7b3 Updated submodules. 
Change-Id: I3d960ec9a9f11da295f603ca6fbfe80ee3681ae9
Reviewed-by: Liang Qi <liang.qi@digia.com>
 2013-02-27 19:44:42 +01:00
Laszlo Papp
2ef82978ca README: Update with the reference platforms and remove the mingw entry 
Change-Id: I1e43a52dc31c1103c91f61e423c6850697bc3540
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-02-23 02:14:55 +01:00
Oswald Buddenhagen
08ec2c7a62 make it possible to explicitly exclude particular modules 
Task-number: QTBUG-26697
Change-Id: Id3f091be5803d922e129e6c3b5d9dfcdd297d18f
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2013-02-20 22:55:13 +01:00
Oswald Buddenhagen
aeed8ce504 semi-automate adding submodules 
this way adding a module actually becomes a one-liner

Change-Id: Ie31039d36e948094c3ec241758eaab330304b194
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2013-02-20 22:55:09 +01:00
Oswald Buddenhagen
0089431326 don't make webkit build conditional on ICU 
webkit now contains its own configure magic to disable itself.

Change-Id: Ibb962fac8ea6275400879c15f24d21f0f8dee855
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2013-02-20 22:55:06 +01:00
Qt Submodule Update Bot
3d960ec9a9 Updated submodules. 
Change-Id: Id7ca18632a1fe4ef542e131aafd3ebb9e854b363
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-01-22 11:59:05 +01:00
Qt Submodule Update Bot
d7ca18632a Updated submodules. 
Change-Id: I9e7460525d8ca86a4578e602d7ce8f71c103ecb3
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-01-16 18:58:16 +01:00
Qt Submodule Update Bot
9e7460525d Updated submodules. 
Change-Id: Id2b2b92d49eae167d99879306523ab1e9ccde7cb
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-01-14 18:56:22 +01:00
Jan Arve Saether
c639fec072 Add ruby to the list of new dependencies for Qt 5 on Windows 
Change-Id: Ieb168e8cd21633216fdb141907047da4e41c5091
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
 2013-01-13 15:55:59 +01:00
Qt Submodule Update Bot
d2b2b92d49 Updated submodules. 
Change-Id: I8cb6c9373f70ee9c52a32bdfb03a9e012db67030
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-01-13 09:53:12 +01:00
David Faure
ba4baee789 Update win_flex.exe from sourceforge 
This fixes compilation on Windows XP.
The previous binary must have been made with a more recent
version of Windows.

Change-Id: I17f392069199f01d603524c8166d940ff1da93bb
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2012-12-19 11:10:03 +01:00
Sergio Ahumada
901fd28fd8 Updated submodules. 
Change-Id: Ifd3ee8634a28f7e769ac6b59c4b7738091210c39
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-12-12 21:53:21 +01:00
Sergio Ahumada
fd3ee8634a Updated submodules. 
Change-Id: I56e6962ad7de00811c1d45484666b86829e75600
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-12-12 16:09:59 +01:00
Sergio Ahumada
56e6962ad7 Updated submodules. 
Change-Id: Ie653efe17d14880969d4089e0cdf89ea5b3825a1
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-12-10 22:44:33 +01:00
Sergio Ahumada
e653efe17d Updated submodules. 
Change-Id: If0efc5c5cc5c3942409a347e826b60108bfea1cc
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-12-10 16:04:01 +01:00
Sergio Ahumada
f0efc5c5cc Updated submodules. 
Change-Id: I238c0f5ce080825f5d82a883c0b39d0cf04ea720
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-12-06 13:05:44 +01:00
Sergio Ahumada
238c0f5ce0 Updated submodules. 
Change-Id: I8d77ff1ef2422259dd6baed5cae9815260e5bee2
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-12-06 07:15:44 +01:00
Sergio Ahumada
8d77ff1ef2 Updated submodules (stable) 
Change-Id: I5a3bcda566072f6c78968eecafdfd904f7986fc0
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-12-04 15:33:37 +01:00
Oswald Buddenhagen
495c7a13f7 (re-)add top-level 'check' target 
Change-Id: I61316db0575bccf168525c7ff9230f675e7db78c
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-12-04 15:33:34 +01:00
Sergio Ahumada
f67e9c6bf2 Updated submodules (stable) 
Change-Id: Ibf84cdee0f17a0d295a34fcb3b2b4155fb16face
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-12-02 14:46:28 +01:00
Oswald Buddenhagen
039f8c8555 remove special handling of qtwebkit 
the svn mirror is now CI-controlled on gerrit and mirrored to gitorious
like any other qt module.

Change-Id: I05ead0a4aaa4fc5348a3e3d39d9ee7db734580f4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Samuli Piippo <samuli.piippo@digia.com>
Reviewed-by: Simo Fält <simo.falt@digia.com>
 2012-11-30 11:14:52 +01:00
Qt Submodule Update Bot
8cb6c9373f Updated submodules. 
Change-Id: I5e8c47946af5049d4e66fab451941b2e0dbb6100
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-11-30 11:14:46 +01:00
Oswald Buddenhagen
c409a85bb8 re-instate a top-level docs target 
now that it's not in default_post any more, each concerned repo needs to
request it explicitly. as this is not a regular qt module, it happens a
bit differently than elsewhere.

Change-Id: I47f741e09add302fb4b1146be73da2f26a67a5af
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
 2012-11-30 00:17:42 +01:00
Qt Submodule Update Bot
5e8c47946a Updated submodules. 
Change-Id: Ic18c2a76ef0fb08f53052b2c7ecea1004cfe508e
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-11-29 08:57:37 +01:00
Qt Submodule Update Bot
c18c2a76ef Updated submodules. 
Change-Id: Ia41ce6cb4f8b4210b01677e524026a91935ab99e
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-11-28 12:29:41 +01:00
Qt Submodule Update Bot
a41ce6cb4f Updated submodules. 
Change-Id: I97d477d4ffa52107e5fb35ad50a9f09197b71bef
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
 2012-11-27 03:54:51 +01:00
Qt Submodule Update Bot
97d477d4ff Updated submodules. 
Change-Id: I471842d8f4cd096ce426723dac19c293421ae61a
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-11-26 16:44:08 +01:00
Simon Hausmann
af96eba3e7 WebKit update 
A new snapshot bringing in new bug fixes :)

Change-Id: Ia15c388a3f9190102c8de41aec53911c493830e5
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2012-11-23 22:03:54 +01:00
Sergio Ahumada
bf8311f879 Updated submodules. 
Change-Id: Ia5e0c2d4327fee6c375dc515b8150cce9679b7e3
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-11-22 21:27:42 +01:00
Joerg Bornemann
9eefa9fb9a Fix parallel builds in WebKit 
The parallel builds aborts because parallel execution of flex breaks
due to the usage of the same temporary file names. This stems from
using a hard coded temp file name "~flex_temp_out_main" and
"random numbers" based on constants in mkstempFILE.

Fixing those issues by embedding the current PID into the temp file
names. Patch is in gnuwin32/patches/win_flex.patch

Change-Id: I6c0cd499b3c9c35128280ec0fee5e450a9ca097f
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2012-11-22 14:58:19 +01:00
Qt Submodule Update Bot
471842d8f4 Updated submodules. 
Change-Id: Ib335981ca0a5a59be4bd6ac26dff44621b915ae3
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
 2012-11-21 23:50:45 +01:00
Qt Submodule Update Bot
b335981ca0 Updated submodules. 
Change-Id: Ib1c03b44976747909ffd3236385ba1e8b14a5ef9
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
 2012-11-21 13:53:56 +01:00
Samuel Rødal
24031b2120 Merge remote-tracking branch 'gerrit/newdocs' into HEAD 
Change-Id: I1eeb68710f8129660f8d83dae924b23eda1401a5
 2012-11-20 11:00:40 +01:00
Qt Submodule Update Bot
b1c03b4497 Updated submodules. 
Change-Id: Ia9e3e72b2ee5ede0ca3ea04912d437230861d8c5
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
 2012-11-20 03:46:39 +01:00
Qt Submodule Update Bot
a9e3e72b2e Updated submodules. 
Change-Id: Ib9f3ea418aaac3bccbb3c0086da96315c10d3cc2
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
 2012-11-17 12:13:19 +01:00
Qt Submodule Update Bot
b9f3ea418a Updated submodules. 
Change-Id: I766ed506501759259b123a11e66bcf52fc2ef123
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
 2012-11-17 02:27:40 +01:00
Qt Submodule Update Bot
766ed50650 Updated submodules. 
Change-Id: I0f161019779eb76fd26d5119a9ea6b1601862fcf
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
 2012-11-14 12:48:25 +01:00