summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Bump version5.6Oswald Buddenhagen2017-09-211-1/+1
| | | | Change-Id: If1f2cd539aad6e9fd8c8fa21e6d47f983d348fbb
* Bump version5.6.3Oswald Buddenhagen2016-11-281-1/+1
| | | | Change-Id: Ib877220e57441331bafccaa8238b258058a919be
* remove dependencies from sync.profileOswald Buddenhagen2016-11-231-15/+1
| | | | | | | the CI obtains them from the qt5 super repo nowadays. Change-Id: Ifd67aa5d0e86b370c8b87fc6654f00dece1abad7 Reviewed-by: Liang Qi <liang.qi@qt.io>
* do not enable example installs explicitly any more5.6.2Oswald Buddenhagen2016-05-241-1/+0
| | | | | | | it's done centrally now. Change-Id: I935b68b00562c96cd9825bb751dc8492e5376954 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Bump versionOswald Buddenhagen2016-05-191-1/+1
| | | | Change-Id: I12349814e2e9971062757f32edd3e22e74c015f2
* add missing example install5.6.1Oswald Buddenhagen2016-04-281-1/+2
| | | | | Change-Id: I1ce5b0f0fa215079d1dcc8f982e8b91918535e22 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Bump versionOswald Buddenhagen2016-02-081-1/+1
| | | | Change-Id: I158b0812181b6d6abb5c1e704622639dac3d9758
* Merge remote-tracking branch 'origin/5.5' into 5.65.6.0Liang Qi2015-08-212-0/+688
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I635bc0ae11b22fa34d415c8d3d62182aa4214882
| * Merge remote-tracking branch 'origin/5.4' into 5.5v5.5.15.5.15.5Liang Qi2015-08-190-0/+0
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I39ddca72cf8d70c2663cc75a87c2295f8d564baf
| | * Bump version5.4Oswald Buddenhagen2015-04-201-1/+1
| | | | | | | | | | | | Change-Id: I02a62b8c147f8b9e4c160c80edc0a662e45c64a8
| * | Add the GPLv3 license textThiago Macieira2015-08-132-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>
| * | Bump versionOswald Buddenhagen2015-06-291-1/+1
| | | | | | | | | | | | Change-Id: I349ebf989e5bef80009d0674a1558c23eed4ad7c
* | | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-06-033-12/+10
|\ \ \ | |/ / | | | | | | Change-Id: I03ffc970213da3aacf20a8f0ed2f585997af8a2b
| * | Disambiguate name of QLocalServer used in Browser example.v5.5.0-rc1v5.5.05.5.0Friedemann Kleint2015-05-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Append Qt version and engine name so that it does not lock out the QtWebEngine based browser and allows for comparing different versions of Qt. Change-Id: Id904d2760dbf44777327b6b21847caf35a811e59 Task-number: QTBUG-46233 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * | Merge remote-tracking branch 'origin/5.4' into 5.5v5.5.0-beta1Frederik Gladhorn2015-03-172-10/+7
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | Conflicts: examples/webkitwidgets/browser/data/defaultbookmarks.xbel examples/webkitwidgets/embedded/anomaly/src/BookmarksView.cpp Change-Id: I5b868d5eb612779b70f8bed123ef85c92caeeb06
| | * Update links from qt-project.org to qt.iov5.4.25.4.2Sergio Ahumada2015-03-062-10/+7
| | | | | | | | | | | | | | | | | | | | | | | | - remove http://qt.digia.com since it now points to qt.io - move webkit.org down to match other repos Change-Id: I036b3ed84bdd8023fd32b7e9ccfde787ce666939 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
| | * Adjust wiki links to the new redirectSergio Ahumada2015-03-031-1/+1
| | | | | | | | | | | | | | | | | | | | | it looks nicer this way Change-Id: I689ec3945bca341c86713c03fa91eb877dbae5e5 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| | * Replace old qt-project.org wiki with wiki.qt.ioSergio Ahumada2015-03-021-1/+1
| | | | | | | | | | | | | | | Change-Id: Ia6984a4382c4c32e9e28a696dfc85bd59d831140 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * | Fix incrementing tab countFrank Osterfeld2015-03-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The typo raised the clang warning "use of unary operator that may be intended as compound assignment (+=)" Change-Id: I237c2182d097d9c726b50f0db3799e3a3f224299 Reviewed-by: Florian Bruhin <qt-project.org@the-compiler.org> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | | Bump versionOswald Buddenhagen2015-02-241-1/+1
|/ / | | | | | | Change-Id: I1be1a29da234da0c6203c905ad02ecae964a226c
* | Fixed BSD licensed file headersv5.5.0-alpha1Jani Heikkinen2015-02-1748-144/+144
| | | | | | | | | | Change-Id: I1844de1a04d930d9c8f4fda0c242a40e22da0ee5 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* | Update copyright headersJani Heikkinen2015-02-12129-766/+766
| | | | | | | | | | | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: Ie12af52d2377d9e9e6f771f676fb286017921c6f Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-01-190-0/+0
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I90fe6ea3b94f6285d96b4568d57926ee12da57d3
| * Bump versionOswald Buddenhagen2015-01-161-1/+1
| | | | | | | | Change-Id: I27636e647d882485f2f1183b0bf75f8ada63eef8
| * Bump versionv5.4.15.4.1Oswald Buddenhagen2014-12-121-1/+1
| | | | | | | | Change-Id: I9ed2b6bc7da9f86d960ebdc3c6a5b5c202101092
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-10-091-1/+0
|\ \ | |/ | | | | Change-Id: I0520ca0382bd378650600d6985a7a6c502d476c6
| * Remove qtdemo from gitignorev5.4.0-rc1v5.4.0-beta1v5.4.05.4.0Rainer Keller2014-09-251-1/+0
| | | | | | | | | | | | | | QtDemo was removed with a commit in qtdoc. Change-Id: I6e0f6297dd39becd516bcbaf94bd1c1fc47f5767 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-09-1966-1175/+1666
|\ \ | |/ | | | | Change-Id: Icc80bf1b3584ea34a073c417ba7c54dfc6f4d106
| * Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-09-160-0/+0
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Iefeecd286820593600dbd4bee5040977d42bdfc3
| | * Bump version5.3Frederik Gladhorn2014-08-291-1/+1
| | | | | | | | | | | | Change-Id: I255ebe9805cb02abaa6f04af816fc5843f3a96c3
| * | Fix build of browser example with QT_NO_CLIPBOARDv5.4.0-alpha1Allan Sandfeld Jensen2014-09-033-0/+6
| | | | | | | | | | | | | | | Change-Id: I408581c6fa655accc22830ed4fb2897a7651dba4 Reviewed-by: Michael Bruning <michael.bruning@digia.com>
| * | Doc: List more file types as example filesTopi Reinio2014-08-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Include some additional (text-format) file types to list as part of the examples. Task-number: QTBUG-40831 Change-Id: Ieca52310b1d847bf6c7a2fc4aacb1e4b9f603767 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * | Update license headers and add new licensesJani Heikkinen2014-08-2465-1175/+1658
| | | | | | | | | | | | | | | | | | | | | - Added LICENSE.LGPL21, LICENSE.LGPLv3 & LICENSE.GPLv2 Change-Id: If7c5fa43341211def780bcb77f922b54ddfafb45 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | | Bump versionOswald Buddenhagen2014-08-091-1/+1
|/ / | | | | | | Change-Id: I1eb558e44434b527cdd1f4e7f816a2c9aa0f0730
* | Doc: Removing url variable from qdocconf file.Jerome Pasion2014-07-091-1/+0
| | | | | | | | | | | | | | -url inherited from the url variable set in qtbase/doc/global Change-Id: I160d518ad0bbe998916433a9cf25b0dfd63222a8 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-06-260-0/+0
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Idc42f077fca0721dca29de4a8077b2ca84bc7884
| * Bump versionv5.3.25.3.2Oswald Buddenhagen2014-06-181-1/+1
| | | | | | | | Change-Id: I5734fa7b08bb3bd94ebf5e841bcb72bc9e074e5b
* | Merge remote-tracking branch 'origin/5.3' into devSergio Ahumada2014-06-146-40/+108
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: If9c3bf3632b0203818aefd12a973f08d60908c91
| * Merge remote-tracking branch 'origin/release' into stablev5.3.1stable5.3.1Jani Heikkinen2014-04-236-40/+108
| |\ | | | | | | | | | Change-Id: Ic2230a86eb0dda83681f3d400367564ad7b594ad
| | * Fix up Fancy Browser example.v5.3.0-rc1v5.3.0releasebaserock/v5.3.05.3.0Michael Brüning2014-04-141-6/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Prevent leaking of MainWindow. * Use proper command line argument parsing. * Make the Qt project page the default page. Task-number: QTBUG-38069 Change-Id: I6142ca207e659e47136e47e4d5817dfa617677e8 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
| | * Fix up tabbed browser example.Michael Brüning2014-04-145-34/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Replaces deprecated Q_WS_MAC preprocessor defines. * Adds a command line parser. * Adds Digia Qt home page to the default bookmarks. * Removes dead Q_WS_QWS flagged code. Task-number: QTBUG-38069 Change-Id: If4ef67434c76c2ea096fa1250a9ffaa0e53e47dd Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
| * | Bump MODULE_VERSION to 5.3.1Sergio Ahumada2014-04-221-1/+1
| |/ | | | | | | | | Change-Id: Ie7b295760ee91612fa741e1a95323fce2db6e0a7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devIikka Eklund2014-04-012-3/+3
|\ \ | |/ | | | | Change-Id: I7536b96428331f5da97ccd8108316e1fd1fecf9b
| * Doc: Fix most of the documentation warningsSergio Ahumada2014-03-272-3/+3
| | | | | | | | | | | | | | | | | | - adding missing index files to \depends - fix warning: Can't link to 'The QtWebKit Bridge' Change-Id: I60665627f1aadbf7bd8a20ddda7d22db9ad694dc Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Doc: Remove nonexistent qtwebkitwidgets referenceSergio Ahumada2014-03-261-1/+1
| | | | | | | | | | | | | | | | There is no such qtwebkitwidgets.index file to be used in \depends Change-Id: I191801d22d908721e8d65b610f684c23b7dc7870 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-03-241-1/+1
|\ \ | |/ | | | | Change-Id: Ibb8862dae6dd3bb20b1be3f74140b3459b20683e
| * Fix typov5.3.0-beta1Sergio Ahumada2014-03-041-1/+1
| | | | | | | | | | Change-Id: I443e6f97335259c3cea69c296d0b2efe5017ba65 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | Bump module version to 5.4.0Thiago Macieira2014-02-201-1/+1
|/ | | | | | Change-Id: Id4712d59cf5ee42b5a04a72f712dc71addd49472 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Merge remote-tracking branch 'origin/stable' into devv5.3.0-alpha1Frederik Gladhorn2014-01-170-0/+0
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Id379003446bebe11e3d3fe7864d7b48e65bf1890
| * Bump MODULE_VERSION to 5.2.2old/5.2Sergio Ahumada2014-01-161-1/+1
| | | | | | | | | | Change-Id: I74b5788f07acf837bb4d81162732644e40f42175 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
View Lorry Controller Status