summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* declare mandatory dep serialbus => serialportOswald Buddenhagen2015-11-131-1/+1
| | | | | | Change-Id: I35c5f18b7c8856071413e50590308f402be7e528 Reviewed-by: Rolf Eike Beer <eb@emlix.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Updated submodules.Jędrzej Nowacki2015-11-1213-0/+0
| | | | | | Change-Id: I8e348f3cab39f75acb68b2bdc388cd37927424bb Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com> Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* Updated submodules.Frederik Gladhorn2015-11-0721-0/+0
| | | | | Change-Id: I0793599392d2e64ceabe8d0f24ba7cb0abc76b84 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* Updated submodules.Jani Heikkinen2015-10-3129-0/+0
| | | | | Change-Id: I4f71eed2d556219480490f433323db4c151b4ba7 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* Update Qt3d manuallyFredrik Orderud2015-10-281-0/+0
| | | | | | | Fixes a crash at destruction. Change-Id: Ie773b3def96cc1e55baa36b9ff7cf697770d479e Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Manual update of qtmultimediaSimon Hausmann2015-10-271-0/+0
| | | | | | | In order to bring in the missing libs for QTBUG-48914 Change-Id: I678dcd1ca5bdae66efdd09b809ff63c7da37d58a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Update Qt3d manuallyFredrik Orderud2015-10-261-0/+0
| | | | | | | | Fixes some nasty threading problems related to pick event race conditions and QThreadPool thread recycling. Change-Id: I977ad310d1a767abc0fbcca49f9088ff5fdda708 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Update WebEngine manuallySimon Hausmann2015-10-231-0/+0
| | | | | | | This brings in MSVC 2015 fixes and RHEL/OpenSuSE build fixes Change-Id: I796c153a005e964c4a32203cfe08cbf3ece5f39e Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Fix dependency order for qtlocation and qtwebviewLaszlo Agocs2015-10-221-3/+3
| | | | | | Change-Id: Ie61b69be3b38975675fff3553d1f5c9510e7865e Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Updated submodules.Simon Hausmann2015-10-2218-0/+0
| | | | | Change-Id: I3094692e61e5a41116d69053d1f296eac46e545b Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Updated submodules.Jani Heikkinen2015-10-1219-0/+0
| | | | | Change-Id: Ifc06de16a694d8d24bdea3a81e796a0c460e1864 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* declare qtgraphicaleffects before qtquickcontrolsOswald Buddenhagen2015-10-121-1/+1
| | | | | | | | | otherwise the dependency is botched. amends 30e19df5b. Change-Id: I8e17d2f91c7c55c49be6239268f928ae4577d17c Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Update build instructions for commercial licenseesIikka Eklund2015-10-121-7/+20
| | | | | | | | | | | | Add build instructions for commercial licensees as well so that the same README covers both opensource and enterprise users. This removes the need having separate README file for commercial users. Change-Id: Ibd3012b428c6fa85f47c1c459d8029ebfce92046 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Explain what the canonical URLs are.Edward Welbourne2015-10-121-1/+2
| | | | | | | | This caught me out the first time I tried to use init-repository. Documentation should work for noobs. Change-Id: Ia6c9ce395ace034128bfe80f2c31be7f9cd4cf35 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Add qtserialport as dependency for qtlocationLaszlo Agocs2015-10-091-1/+1
| | | | | | Task-number: QTBUG-48082 Change-Id: I7b90777bfdd1286f6340caf756562146772d0bb3 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Updated submodules.Jani Heikkinen2015-10-0625-0/+0
| | | | | Change-Id: I871b519649bb6130db128d7ae4c0916ee2e48146 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Updated submodules.Simon Hausmann2015-09-266-0/+0
| | | | | Change-Id: Ia0a52a43a8c5fa7516c1469241a449c457153040 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Updated submodules.Simon Hausmann2015-09-2514-0/+0
| | | | | Change-Id: Ic5ea73d6ca0ea2e174cd592226a16885a73aeed1 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Add a way to build just a few of Qt's modules more easilyThiago Macieira2015-09-241-0/+1
| | | | | | | | | | | | | | 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>
* Add qtpurchasing as non-default moduleFrederik Gladhorn2015-09-243-0/+5
| | | | | | | 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>
* Updated submodules.Simon Hausmann2015-09-228-0/+0
| | | | | | Change-Id: If0045fccac1af79e858831c75c7808fe6997e37e Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* Updated submodules.Jani Heikkinen2015-09-2114-0/+0
| | | | | Change-Id: I3c4cdbef3f8fbc016757fdd6a4b5bb8eb6a644df Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* Manual update of qttools to remove webkit dependencySimon Hausmann2015-09-181-0/+0
| | | | | Change-Id: I6cf6ae75cedb0945c46fd9b3fa63bd21a9ce4806 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Updated submodules.Simon Hausmann2015-09-1722-0/+0
| | | | | Change-Id: I03bbaedeb88ad76df39ce10f6828ebf5c8b8dadf Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.5' into 5.6Oswald Buddenhagen2015-09-102-0/+0
|\ | | | | | | Change-Id: I7a28bcaeb5538763274fdef20f8c8ca81b9b21ad
| * Updated submodules.Qt Submodule Update Bot2015-09-048-0/+0
| | | | | | | | | | Change-Id: I0ba6e6ce435be779865b0ace08d74dd29800be9c Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| * gnuwin32: remove win_bison/win_flexAndrew Knight2015-09-012-0/+0
| | | | | | | | | | | | | | | | | | 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>
| * Updated submodules.Qt Submodule Update Bot2015-09-0110-0/+0
| | | | | | | | | | Change-Id: I1497a398e34e18abb18f705b2294464840629ca1 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| * Updated submodules.Qt Submodule Update Bot2015-08-254-0/+0
| | | | | | | | | | Change-Id: I56e7af096e889d56ef67baabf38529c0ccb8d8b5 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* | Add QtQuickControls2 as submodulev5.6.0-alpha1Frederik Gladhorn2015-09-033-0/+6
| | | | | | | | | | Change-Id: I435fb765b48a978763384226e399b33448a40502 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* | Hook qtserialbus into qt5.gitAlex Blasche2015-09-033-0/+5
| | | | | | | | | | Change-Id: I17c8c55205f852b3e79f279cad7b87f403d7fbe7 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Add qtwebview as submoduleFrederik Gladhorn2015-09-033-0/+6
| | | | | | | | | | | | Change-Id: I6a69b08945767f4cb8f4164630c726cf8bf552bb Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* | Removed QtWebkit and QtWebkit-Examples from qt5.gitJani Heikkinen2015-09-033-15/+2
| | | | | | | | | | | | | | | | | | 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>
* | Fix QtEnginio branchSimon Hausmann2015-09-031-1/+1
| | | | | | | | | | | | | | | | | | 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>
* | Updated submodules.Simon Hausmann2015-09-0332-0/+0
| | | | | | | | | | Change-Id: Ie8c296b8e64fe0083ab5ec1584a42c7165fbe3ab Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Remove quick1 from default checkoutJani Heikkinen2015-08-271-1/+0
| | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-08-2467-55215/+24
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Updated submodules.Qt Submodule Update Bot2015-08-2120-0/+0
| | | | | | | | | | Change-Id: Icf1e00c471aea0ce5228165735195a9f0f76fe36 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| * Updated submodules.Qt Submodule Update Bot2015-08-1831-0/+0
| | | | | | | | | | Change-Id: Id60882b0bc98875361477cb5aaf7d12c2693f900 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| * Add the GPLv3 license textThiago Macieira2015-08-142-0/+688
| | | | | | | | | | | | | | LGPLv3 refers to it but does not include it in its body. Change-Id: Ib056b47dde3341ef9a52ffff13eed18cf3504738 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
| * Merge remote-tracking branch 'origin/5.4' into 5.5Oswald Buddenhagen2015-08-142-3/+3
| |\ | | | | | | | | | Change-Id: I5b894e7f72ad81e62a6ea0777e6713dfa36c8a68
| | * Merge remote-tracking branch 'origin/5.4.2' into 5.45.4Oswald Buddenhagen2015-08-140-0/+0
| | |\ | | | | | | | | | | | | Change-Id: Id8fa6d30810f8bfe46d5aa7e279c69ea560edd19
| | | * Merge branch '5.4' into 5.4.2v5.4.2Oswald Buddenhagen2015-05-293-7/+7
| | | |\ | | | | | | | | | | | | | | | Change-Id: I33d967b5f668c672a55ad93ac314340453850521
| | | * | Updated submodules.Qt Submodule Update Bot2015-05-291-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I670466b6a3ff58edb40c91ff86c443cd6dd20126 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| | | * | Updated submodules.Qt Submodule Update Bot2015-05-283-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I07856d73e19b60fbc01ff650cddb1d557db35617 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| | | * | Updated submodules.Qt Submodule Update Bot2015-05-234-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idfffbfdc266be3f52f716b152bbcb70810127cc9 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| | | * | Updated submodules.Qt Submodule Update Bot2015-05-162-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I24f1b3219d1db41acc3f0781fa38f253bcb04da3 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| | | * | Updated submodules.Qt Submodule Update Bot2015-05-132-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If7cb995d04fdc05b35df8b6c5215bf530006b984 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| | | * | Updated submodules.Qt Submodule Update Bot2015-05-093-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I11963ba9f0141fc72dadedffe2c36fba5be16186 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| | | * | Updated submodules.Qt Submodule Update Bot2015-05-031-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I39ce0228dad0d141df17ea5f911046130f823467 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>