lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-02 03:36:54 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,126 Commits 118 Branches 270 Tags
ee443af31444ccb847201e95d22a75d8aa07d613
Commit Graph

1126 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laszlo Agocs
ee443af314 Add qtserialport as dependency for qtlocation 
Task-number: QTBUG-48082
Change-Id: I7b90777bfdd1286f6340caf756562146772d0bb3
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
 2015-10-09 12:05:04 +00:00
Jani Heikkinen
d16a8656f9 Updated submodules. 
Change-Id: I871b519649bb6130db128d7ae4c0916ee2e48146
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
 2015-10-06 17:21:56 +00:00
Simon Hausmann
c78fc65631 Updated submodules. 
Change-Id: Ia0a52a43a8c5fa7516c1469241a449c457153040
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
 2015-09-26 11:22:38 +00:00
Simon Hausmann
ae1dc7aa3e Updated submodules. 
Change-Id: Ic5ea73d6ca0ea2e174cd592226a16885a73aeed1
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
 2015-09-25 19:35:21 +00:00
Thiago Macieira
942ae1dd82 Add a way to build just a few of Qt's modules more easily 
The current way requires passing -skip to configure, which is a list
of what not to build. To set a list of what to build (e.g., for
testing, in a specialized build, etc.), there was no way. Now you can
just do:

    qmake "QT_BUILD_MODULES=qtbase qtdeclarative qtsvg qtxmlpatterns"

(the order doesn't matter)

Change-Id: Ifcaefa35b16b137866ca839a483ce366e35de7ab
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
 2015-09-24 05:22:45 +00:00
Frederik Gladhorn
d7f477d1cd Add qtpurchasing as non-default module 
For 5.6 this is a tech preview, it will be added properly in 5.7.

Change-Id: I709830fbcfc439d5446718093f0c16ad2dcb1e57
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
 2015-09-24 05:22:42 +00:00
Simon Hausmann
c42dd3462b Updated submodules. 
Change-Id: If0045fccac1af79e858831c75c7808fe6997e37e
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
 2015-09-22 16:40:33 +00:00
Jani Heikkinen
944aa6bcbb Updated submodules. 
Change-Id: I3c4cdbef3f8fbc016757fdd6a4b5bb8eb6a644df
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2015-09-21 13:24:01 +00:00
Simon Hausmann
a89c6ef703 Manual update of qttools to remove webkit dependency 
Change-Id: I6cf6ae75cedb0945c46fd9b3fa63bd21a9ce4806
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
 2015-09-18 06:33:36 +00:00
Simon Hausmann
2ebfdb4ca8 Updated submodules. 
Change-Id: I03bbaedeb88ad76df39ce10f6828ebf5c8b8dadf
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
 2015-09-17 11:37:09 +00:00
Oswald Buddenhagen
9bde440225 Merge remote-tracking branch 'origin/5.5' into 5.6 
Change-Id: I7a28bcaeb5538763274fdef20f8c8ca81b9b21ad
 2015-09-10 14:24:15 +02:00
Qt Submodule Update Bot
dd1aeea722 Updated submodules. 
Change-Id: I0ba6e6ce435be779865b0ace08d74dd29800be9c
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2015-09-04 04:24:15 +00:00
Frederik Gladhorn
e734941df8 Add QtQuickControls2 as submodule 
Change-Id: I435fb765b48a978763384226e399b33448a40502
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
v5.6.0-alpha1 		2015-09-03 22:45:29 +00:00
Alex Blasche
c5cb9d2d89 Hook qtserialbus into qt5.git 
Change-Id: I17c8c55205f852b3e79f279cad7b87f403d7fbe7
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
 2015-09-03 17:40:25 +00:00
Frederik Gladhorn
4c520caa69 Add qtwebview as submodule 
Change-Id: I6a69b08945767f4cb8f4164630c726cf8bf552bb
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
 2015-09-03 17:40:17 +00:00
Jani Heikkinen
4116ec2474 Removed QtWebkit and QtWebkit-Examples from qt5.git 
QtWebkit (and QtWebkit-Examples) were deprecated in Qt 5.5 and will now
be removed from qt5.git in Qt5.6 release

Change-Id: I86e1072141956136fa5e4220cdcdf812492453b3
Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
 2015-09-03 17:40:10 +00:00
Simon Hausmann
3e1fd2cb31 Fix QtEnginio branch 
The 1.3 branch does not exist anymore, let's use 5.6

Change-Id: I442ad45c73a0e08c853385c999dddf818447bb82
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2015-09-03 17:40:03 +00:00
Simon Hausmann
1a46c456eb Updated submodules. 
Change-Id: Ie8c296b8e64fe0083ab5ec1584a42c7165fbe3ab
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
 2015-09-03 17:39:54 +00:00
Andrew Knight
7bbe464617 gnuwin32: remove win_bison/win_flex 
These tools are copies of bison/flex and are no longer needed.

Change-Id: Ia543926ee8126358beee2aed03752d9cfe803f07
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
 2015-09-01 05:56:07 +00:00
Qt Submodule Update Bot
0ba6e6ce43 Updated submodules. 
Change-Id: I1497a398e34e18abb18f705b2294464840629ca1
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2015-09-01 05:56:00 +00:00
Jani Heikkinen
812ff69df4 Remove quick1 from default checkout 
QtQuick1 was deprecated in Qt 5.5 and will now be removed from
default modules in qt5.git

Change-Id: I88aa9d75ace8d91b4cd469d7511662425e67d95f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
 2015-08-27 19:44:22 +00:00
Qt Submodule Update Bot
1497a398e3 Updated submodules. 
Change-Id: I56e7af096e889d56ef67baabf38529c0ccb8d8b5
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2015-08-25 04:33:00 +00:00
Liang Qi
c9425926e1 Merge remote-tracking branch 'origin/5.5' into 5.6 
Conflicts:
	qt3d
	qtactiveqt
	qtandroidextras
	qtbase
	qtcanvas3d
	qtconnectivity
	qtdeclarative
	qtdoc
	qtenginio
	qtgraphicaleffects
	qtimageformats
	qtlocation
	qtmacextras
	qtmultimedia
	qtqa
	qtquick1
	qtquickcontrols
	qtrepotools
	qtscript
	qtsensors
	qtserialport
	qtsvg
	qttools
	qttranslations
	qtwayland
	qtwebchannel
	qtwebengine
	qtwebkit
	qtwebkit-examples
	qtwebsockets
	qtwinextras
	qtx11extras
	qtxmlpatterns

Change-Id: I7410d9be5775ab276fb5a57adb397f4f92d77a50
 2015-08-24 16:18:23 +02:00
Qt Submodule Update Bot
56e7af096e Updated submodules. 
Change-Id: Icf1e00c471aea0ce5228165735195a9f0f76fe36
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
 2015-08-21 09:43:42 +00:00
Qt Submodule Update Bot
cf1e00c471 Updated submodules. 
Change-Id: Id60882b0bc98875361477cb5aaf7d12c2693f900
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2015-08-18 04:24:52 +00:00
Thiago Macieira
d7b8b62cb3 Add the GPLv3 license text 
LGPLv3 refers to it but does not include it in its body.

Change-Id: Ib056b47dde3341ef9a52ffff13eed18cf3504738
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
 2015-08-14 13:39:09 +02:00
Oswald Buddenhagen
bf5c38f136 Merge remote-tracking branch 'origin/5.4' into 5.5 
Change-Id: I5b894e7f72ad81e62a6ea0777e6713dfa36c8a68
 2015-08-14 13:38:53 +02:00
Oswald Buddenhagen
3f2ff8b460 Merge remote-tracking branch 'origin/5.4.2' into 5.4 
Change-Id: Id8fa6d30810f8bfe46d5aa7e279c69ea560edd19
 2015-08-14 13:34:32 +02:00
Mitch Curtis
30e19df5bf Add qtgraphicaleffects as an optional dependency for qtquickcontrols. 
This is a prerequisite to making qtgraphicaleffects a dependency in
qtquickcontrols' sync.profile.

Task-number: QTBUG-46393
Change-Id: I3679392a7feb48ecefa4a01a7ecb42b2e6287ecb
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
 2015-08-13 11:52:55 +00:00
Andrew Knight
3d7fe3b822 gnuwin32: Remove old versions of bison/flex from the distribution 
The win_flex/win_bison tools are already in the repository and working
with all projects, so the GnuWin32 versions can be removed and the
winflexbison versions can take their place.

Task-number: QTBUG-46852
Change-Id: I41bc541adab834ff83912d7a4f076a87fc174601
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
 2015-08-13 04:45:21 +00:00
Qt Submodule Update Bot
d60882b0bc Updated submodules. 
Change-Id: Idbdb4ce40f9456898ac9148dc08473f636f34f1d
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2015-08-13 04:45:15 +00:00
Oswald Buddenhagen
f587983764 fix qtcanvas3d submodule reference 
Change-Id: I67d89f5e8d04a1e60ff0aedc33e29da7a58df620
 2015-08-12 16:31:03 +02:00
Oswald Buddenhagen
cab251cd8d Adjust submodule branches 
Change-Id: I7755bb88167297aef9defaa6b66639fde6e9804d
 2015-08-10 16:53:39 +02:00
Qt Submodule Update Bot
dbdb4ce40f Updated submodules. 
Change-Id: I20beccb62815f3c6948d888ccfad0b69c42b55e0
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2015-08-07 06:55:47 +00:00
Qt Submodule Update Bot
20beccb628 Updated submodules. 
Change-Id: Ie77fe47fcec71a13d3640059d1e0ce66a47fc0b2
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
 2015-07-14 03:17:43 +00:00
Qt Submodule Update Bot
e77fe47fce Updated submodules. 
Change-Id: I22c7d89fd93a256c4051f49b9a9b89789e697df6
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
 2015-07-11 09:46:26 +00:00
Qt Submodule Update Bot
1d3966833b Updated submodules. 
Change-Id: Idc11a328839163ffae5e72f2e43860b12f19c668
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
 2015-07-11 03:32:32 +00:00
Qt Submodule Update Bot
22c7d89fd9 Updated submodules. 
Change-Id: Ideafacc193da59a1db25e006b16630b74535cbee
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
 2015-06-30 18:19:55 +00:00
Kai Koehne
345e4356b7 README: Replace qt-project.org with qt.io 
Change-Id: Iacc4dc8f28ce2c0bb1d761834d0f90b444f47327
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
 2015-06-30 18:19:33 +00:00
Qt Submodule Update Bot
deafacc193 Updated submodules. 
Change-Id: Ibc862a8b12e46042819341229b31883bc9a1462e
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
 2015-06-29 19:59:42 +00:00
Aaron McCarthy
fb5e3cc2d3 Add qtquickcontrols as an optional dependency to qtlocation module 
With the correct modules checked out 'make module-qtlocation' will build
everything necessary to run the examples.

Change-Id: I0c63221b5704c2b13495f3dc3221e888d8e9547c
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
 2015-06-26 06:46:09 +00:00
Qt Submodule Update Bot
bc862a8b12 Updated submodules. 
Change-Id: Ie231e8be72006172dd80ec9f1df8f57e7fc54891
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
 2015-06-26 05:37:28 +00:00
Qt Submodule Update Bot
dc11a32883 Updated submodules. 
Change-Id: Ic5910fb0b28553d1eb0815e578381fd358e342fc
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
 2015-06-25 19:31:21 +00:00
Qt Submodule Update Bot
e231e8be72 Updated submodules. 
Change-Id: Icc425a6784ea3ae379716ddb1e79a8a07ccd8d74
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
 2015-06-25 19:31:02 +00:00
Qt Submodule Update Bot
cc425a6784 Updated submodules. 
Change-Id: I88f32b10ee95f967686bf9c3295887b4ebb62eba
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
 2015-06-24 07:00:47 +00:00
Qt Submodule Update Bot
c5910fb0b2 Updated submodules. 
Change-Id: Ic5e879665945d79c0fcdb27c2c00978b7abdeef6
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
 2015-06-23 19:28:08 +00:00
Qt Submodule Update Bot
c5e8796659 Updated submodules. 
Change-Id: I5c321f6626e9bf6f64f2c120e8281547e2561880
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
 2015-06-21 11:31:31 +00:00
Qt Submodule Update Bot
5c321f6626 Updated submodules. 
Change-Id: I3009287ec75bfa7b3084fad32a75552656845434
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
 2015-06-20 17:13:47 +00:00
Qt Submodule Update Bot
88f32b10ee Updated submodules. 
Change-Id: Ibc644efc00d00f43c1d202106bae6facf015c7fb
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
 2015-06-20 06:59:07 +00:00
Qt Submodule Update Bot
0d60d720f8 Updated submodules. 
Change-Id: I00defc7101f1cabc0cc540a84846ec9b7933f599
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
 2015-06-19 18:49:53 +00:00