summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add changes file for 5.9.1v5.9.15.9.1Jani Heikkinen2017-06-221-0/+24
| | | | | Change-Id: I5d369201adf48a2f7b9886dd9576525dfe220842 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Merge remote-tracking branch 'origin/5.9.0' into 5.9Liang Qi2017-05-311-0/+16
|\ | | | | | | Change-Id: Icab7370ac5e12caa84d24ee4d386bada92c14cf2
| * Add changes file for 5.9.0v5.9.0-rc2v5.9.0-rc1v5.9.0-beta4v5.9.05.9.0Antti Kokko2017-05-051-0/+16
| | | | | | | | | | | | | | Listing important changes and bug-fixes. Change-Id: I560972c9fbf7b4d3aeaafda88e5c99d3147dca43 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Bump versionOswald Buddenhagen2017-05-101-1/+1
|/ | | | Change-Id: I322a0b7a42d2a8d75763099266770735fa87ca48
* Merge remote-tracking branch 'origin/5.8' into 5.9v5.9.0-beta3v5.9.0-beta2v5.9.0-beta1Liang Qi2017-03-101-0/+16
|\ | | | | | | Change-Id: If54b3b14761bcb05252e882f8e5f140dfb81d54b
| * Merge remote-tracking branch 'origin/5.8.0' into 5.85.8Liang Qi2017-01-261-0/+16
| |\ | | | | | | | | | Change-Id: Ie6c79b1e1c641a24db171882aedb083b98ee8ca1
| | * Add changes file for 5.8.0v5.8.0-rc1v5.8.05.8.0Antti Kokko2016-12-131-0/+16
| | | | | | | | | | | | | | | Change-Id: I7af199513d6810edb2de69b04989fdcb28328aab Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | Merge remote-tracking branch 'origin/5.8' into devv5.9.0-alpha1Liang Qi2017-01-254-10/+15737
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I1adbe081b5d636690616959bbab32890a9374ac3
| * | Bump versionOswald Buddenhagen2017-01-031-1/+1
| | | | | | | | | | | | Change-Id: I068b177beb1f2924df073a6661e35563926c62aa
| * | Binary compatibility file and global.cfg for QtX11ExtrasMilla Pohjanheimo2016-12-082-0/+7756
| |/ | | | | | | | | | | | | | | BC file and an include file added for QtX11Extras module Change-Id: I2198f961287d5aa2cdbc18a68aa6ed0bce74fb60 Reviewed-by: Sergio Ahumada <sahumada@texla.cl> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-262-10/+7981
| |\ | | | | | | | | | Change-Id: Iff115b9216edf478b205832187565dcda4675af4
| | * Merge remote-tracking branch 'origin/5.6' into 5.75.7Liang Qi2016-11-241-10/+0
| | |\ | | | | | | | | | | | | Change-Id: I58bb550660a02040f7d01a30d81a635391cfc804
| | | * remove dependencies from sync.profileOswald Buddenhagen2016-11-061-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | the CI obtains them from the qt5 super repo nowadays. Change-Id: Id54d6fbe2dadd1c3dac340bebd91ec6439a34897 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| | * | Binary compatibility file added for QtX11Extras (5.7)v5.7.15.7.1Milla Pohjanheimo2016-10-041-0/+7981
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added the generated data files for the binary compatibility tests for QtX11Extras for Qt 5.7. Change-Id: Iaaf08e1fe7a6756ee562131cf0712c41392ae88b Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* | | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-09-234-1/+7
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I5e403aafd4ef57dbbe813f1b7e62b49b18f77881
| * | | Eradicate last Q_FOREACH and mark the library as Q_FOREACH-free and ↵v5.8.0-beta1Marc Mutz2016-09-232-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | warning_clean The only public header, qx11info_x11.h isn't actually recognized by headersclean as a public header, so warning_clean has no effect. But the header _is_ clean, and maybe headersclean in QtBase will be fixed at some point. Change-Id: I23ef8476bee111685d7261322b4f7af47498dc96 Reviewed-by: Gabriel Hege <hege@daviko.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * | | Make sure we find the xcb feature from QtGuiLars Knoll2016-09-142-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Required to be able to continue to compile this module with the modularized configure Change-Id: Idd5984576ba770cccd2312e91dbd2ff2bcc55fab Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | | Bump versionOswald Buddenhagen2016-08-291-1/+1
|/ / / | | | | | | | | | Change-Id: I0547857941ca77d738d52f5b44c4a28198f21d7b
* | | Adjust to qtConfig() changes in qtbasev5.8.0-alpha1Lars Knoll2016-08-192-2/+2
| | | | | | | | | | | | | | | Change-Id: I15ab6f816ba30f16cac7f2e3d6ab0ebd549a3ade Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-025-4/+46
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I4752ddb590f0389bda606dfd7478cf9d26b2199c
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-014-4/+4
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ie176f84f2ff0160efa4e39491e6a86d5a8d84f20
| | * Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit"v5.6.25.6.2Sze Howe Koh2016-06-174-4/+4
| | | | | | | | | | | | | | | | | | | | | See http://comments.gmane.org/gmane.comp.lib.qt.devel/25771 Change-Id: Iccf19d5706973fad19f6c4f460f3a37eccb2ef97 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| | * Bump versionOswald Buddenhagen2016-05-191-1/+1
| | | | | | | | | | | | Change-Id: I24a5649ceada34ddb484ed237eb60016f09e924c
| * | Bump versionOswald Buddenhagen2016-07-281-1/+1
| | | | | | | | | | | | Change-Id: I236bc99ac3e284098b88b205d6111b7559b97a82
| * | Merge remote-tracking branch 'origin/5.7.0' into 5.7Liang Qi2016-06-161-3/+19
| |\ \ | | | | | | | | | | | | Change-Id: I9dca0793fa85f3f0d92f0aff276acd816ef4aef6
| | * | Mention license change in 5.7.0 changelogv5.7.05.7.0Jani Heikkinen2016-06-091-3/+19
| |/ / | | | | | | | | | | | | | | | Change-Id: I46adeb70d6efd90cb4c3f97e33c79a6c6062edfd Reviewed-by: Sami Makkonen <sami.makkonen@qt.io> Reviewed-by: Antti Kokko <antti.kokko@qt.io>
| * | Added 5.7 changelog for QtX11Extras.v5.7.0-rc1David Faure2016-05-261-0/+26
| | | | | | | | | | | | | | | Change-Id: I636350b5931c7aa1f22a2e60cac801f8bd5731ad Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-05-241-0/+1
|\ \ \ | |/ / | | | | | | Change-Id: I3bc3ac22ef1debe50429e67780c03f2b44318b17
| * | Revert "Add missing qdebug.h include"Nikita Krupenko2016-05-171-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ef878e7f30d3c407adafc62166adc86b1658f7f2. Required include already added in 4fd9c8527cfb5c5942712393b3577c0ed6405dc2. Change-Id: Iabc0bd42788151e922bdd8157a09ab8b43abcb54 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
| * | Add missing qdebug.h includeNikita Krupenko2016-05-171-0/+1
| | | | | | | | | | | | | | | Change-Id: I081b597eedad6ea90afcfd53c0497fe941f3168d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * | QX11Info: Add missing includeGabriel de Dietrich2016-05-171-0/+1
| | | | | | | | | | | | | | | Change-Id: Ie1a54eaf5b450ea638766035cdaaf50750e6de50 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-04-084-11/+51
|\ \ \ | |/ / | | | | | | Change-Id: I98ab3d1c372f68a7a24f831be30bae939c6a62ba
| * | Fix documentation of QX11Info::isCompositingManagerRunning().v5.7.0-beta1Friedemann Kleint2016-03-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fix warning: qtx11extras/src/x11extras/qx11info_x11.cpp:379: warning: Can't link to '-1' Change-Id: I8165a6e2b512a1fc265f4946e8fdc47dc3558109 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
| * | Add QX11Info::isCompositingManagerRunning() functionGabriel de Dietrich2016-03-223-0/+29
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-41195 Change-Id: Id4b385478dad85dd02c484fe9c44666bae46268b Reviewed-by: Błażej Szczygieł <spaz16@wp.pl> Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Gabriel de Dietrich2016-03-212-11/+22
| |\ \ | | |/ | | | | | | Change-Id: I406ef8471dca716daf694a0bb88dc7295c6d0a5e
| | * Properly get appDpiX, appDpiY and appRootWindow for X screenv5.6.1-1v5.6.15.6.1Alexander Volkov2016-03-051-8/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | X screen is a virtual desktop in Qt terminology. So find the first QScreen which belongs to the requested virtual desktop and use it to get the values. Change-Id: If5c08ff6c3e19e1d49d17ae8e1c54e09ffeb97cf Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
| | * don't over-expose private dependenciesOswald Buddenhagen2016-02-251-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: I64c6bcde0f374f4807e6b7ceccc6cc0f81e33459 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: David Faure <david.faure@kdab.com>
| | * consistently put {qt,qml}_{module,plugin} at the end of project filesOswald Buddenhagen2016-02-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | this fixes static builds by ensuring that all dependencies are exported. Task-number: QTBUG-51071 Change-Id: If23f1aa1583ff48d370b1c85ebc017726521b5c0 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| | * Bump versionOswald Buddenhagen2016-02-081-1/+1
| | | | | | | | | | | | Change-Id: Iedef6ec611866ed28d7c7efdc60e45f20006e7b0
* | | Bump versionOswald Buddenhagen2016-02-231-1/+1
|/ / | | | | | | Change-Id: I469ab645b9044597968666d0fee09fcf975e1c6b
* | Updated license headersv5.7.0-alpha1Antti Kokko2016-01-203-35/+729
| | | | | | | | | | | | | | | | | | | | | | From Qt 5.7 -> tools & applications are lisenced under GPL v3 with some exceptions, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new GPL-EXCEPT header instead of LGPL21 one (in those files which will be under GPL 3 with exceptions) Change-Id: I56e5124abdd9eb751877e42bb7c44de5961f4c60 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Updated license headersAntti Kokko2016-01-206-44/+1240
| | | | | | | | | | | | | | | | | | | | From Qt 5.7 -> LGPL v2.1 isn't an option anymore, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new LGPL header instead of LGPL21 one (in those files which will be under LGPL v3) Change-Id: I4330fc4948a0f87880e57f1222d558c38f313564 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-10-142-0/+688
|\ \ | |/ | | | | Change-Id: Icc579ffad1bdcd66d1521dbc8ef287fd7f0d12c2
| * Merge remote-tracking branch 'origin/5.5' into 5.6v5.6.0-rc1v5.6.0-beta1v5.6.0-alpha1v5.6.05.6.0Liang Qi2015-08-212-0/+688
| |\ | | | | | | | | | Change-Id: Ia2a92924bf947cfe7fe6e0d7e6f680addd94b863
| | * 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: I940895f7ce36969a273e8e3761dbe370e2dad951
| | | * Bump version5.4Oswald Buddenhagen2015-04-201-1/+1
| | | | | | | | | | | | | | | | Change-Id: I992ec5395e459cb09a8cda8356d3a5562c86c7ca
| | * | 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-09-101-1/+1
|/ / / | | | | | | | | | Change-Id: I5370145fb163e895d523daf64493a799fc8d1049
* | | Merge remote-tracking branch 'origin/5.5' into devFrederik Gladhorn2015-08-090-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I09262494f1860abdb21a33a430e8dd83d2a4627e
| * | Bump versionOswald Buddenhagen2015-06-291-1/+1
| | | | | | | | | | | | Change-Id: I681498fdd601637bd05431e2279f3e2332e7bc76
View Lorry Controller Status