aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Updated submodules.Qt Submodule Update Bot2016-01-2330-0/+0
| | | | | Change-Id: I790e982492004e93953bed503a1d777d27c28b6f Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.6' into devSimon Hausmann2016-01-224-201/+204
|\ | | | | | | Change-Id: I62519dfde84c16a7dfe1b6f225e40e6f16d3105c
| * Updated submodules.Qt Submodule Update Bot2016-01-2212-0/+0
| | | | | | | | | | Change-Id: I2c671f50d878e8ed03418c2a59c8c997ed3bd6f4 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * move module dependencies from qt.pro to .gitmodulesOswald Buddenhagen2016-01-223-82/+117
| | | | | | | | | | | | | | | | | | | | | | | | this removes the last redundant module list. the module build order which is not determined by dependencies is pretty random now. this is avoided for a few heavy and "less relevant" modules by setting a priority to built them as late as possible. Change-Id: Ie8ef9777d050a4915cd2282dc9ccb48fcdbc02d2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Updated submodules.Qt Submodule Update Bot2016-01-196-0/+0
| | | | | | | | | | Change-Id: Ie0cf0058a5e8f383be4608a5c094b610b9a575af Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Updated submodules.Qt Submodule Update Bot2016-01-1816-0/+0
| | | | | | | | | | Change-Id: Ia4dbb4d02b5c32c76cd9cbdc320709af668dc4bc Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Updated submodules.Qt Submodule Update Bot2016-01-1713-0/+0
| | | | | | | | | | Change-Id: I3ce0cb4e9ea44dcd860b48d3a6ecaad0eb31964f Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Updated submodules.Qt Submodule Update Bot2016-01-1219-0/+0
| | | | | | | | | | | | Change-Id: Iff91870d954d24d2649334d2eeb8357e483009b3 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| * Updated submodules.Qt Submodule Update Bot2016-01-059-0/+0
| | | | | | | | | | Change-Id: Ibacf35a5fb113f9b54a96c10d52aa70e2e64f8da Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| * don't use POD, to restore msysgit perl compatibilityOswald Buddenhagen2015-12-251-112/+83
| | | | | | | | | | Change-Id: I360a6d5246e33dcf3f72bc83f2790905af8c1463 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * don't use GetOptionsFromArray, to restore msysgit perl compatibilityOswald Buddenhagen2015-12-251-4/+4
| | | | | | | | | | Change-Id: Ic02a5d8b5a8a813a23bed1c0b45bcb8ee47e3edb Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * make qtandroidextras a regular optional dependency of qtconnectivityOswald Buddenhagen2015-12-251-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | we want to move to a purely declarative way to declare submodules, so the conditional has to go. instead, use an optional dependency to ensure build order, while the module excludes itself via requires() if its dependency is missing. Change-Id: I615382700ff601c9ab003d131b2cc600441c514c Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * Updated submodules.Qt Submodule Update Bot2015-12-2413-0/+0
| | | | | | | | | | Change-Id: Icf4a1303edde9048adcb9bb40ced1b503a170f22 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Updated submodules.Simon Hausmann2015-12-179-0/+0
| | | | | | | | | | Change-Id: I701ce99cb7eb7fa8daffa67699920f51a7ab2087 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Updated submodules.Simon Hausmann2015-12-169-0/+0
| | | | | | | | | | Change-Id: I806a9fb4b31adf8c02e00c2320d53f7d7fe3669e Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Updated submodules.Simon Hausmann2015-12-174-0/+0
| | | | | | | | | | Change-Id: I5d7279982a017ef903991faa89c79ca10e717497 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Enable qtpurchasing by defaultLiang Qi2015-12-161-0/+1
| | | | | | | | | | Change-Id: I4030b9f446a865e758492e2f07b8adb19052e91d Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* | Manually update qtpurchasingLiang Qi2015-12-161-0/+0
| | | | | | | | | | Change-Id: I7385116d7c6e9a7f9b7b2be4b76468b8459299dd Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-12-155-13/+39
|\| | | | | | | Change-Id: Ibd5caf0448c9eba9251bc9395fe647f1955743f0
| * Updated submodules.v5.6.0-beta1Simon Hausmann2015-12-1515-0/+0
| | | | | | | | | | Change-Id: Iba5d9c28367748258013888c93ab773eb05bb0ee Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Updated submodules.Simon Hausmann2015-12-1014-0/+0
| | | | | | | | | | Change-Id: Ia00cca2d8c22ff96a4f871d70eaa9eb55f6391b0 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Updated submodules.Antti Kokko2015-12-0816-0/+0
| | | | | | | | | | Change-Id: Ic83700e48f40b0ee8e76f4b4e44b28b4c85bebb7 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * error-check dependency declarationsOswald Buddenhagen2015-12-011-0/+6
| | | | | | | | | | | | Change-Id: I98ad68d8be608b144c5f2ff422aaf7baab9907e8 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
| * Updated submodules.Antti Kokko2015-12-0119-0/+0
| | | | | | | | | | Change-Id: Id124a31338548d9a76baa908b281b3bb6ede168a Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
| * Updated submodules.Frederik Gladhorn2015-11-1611-0/+0
| | | | | | | | | | | | Change-Id: Id3463e24f1aecc6e2d4d040bc7878ad1d48f6327 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| * 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.Liang Qi2015-12-1531-0/+0
| | | | | | | | | | Change-Id: I54527e1c5ad138ac63d38d8eabcf158d11b0286d Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | Updated submodules.Qt Submodule Update Bot2015-09-2133-0/+0
| | | | | | | | | | Change-Id: I1d3966833b5f27fb262f2d3727557ef2c8947828 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 18:01:06 +0000