summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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>
* 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
* | 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
* | | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-03-171-2/+2
|\ \ \ | |/ / | | | | | | Change-Id: I1e627b4485ff27c4f4e70bab119cd8319bc2d30f
| * | Do not return null Display or Connection when there are no screensv5.5.0-rc1v5.5.0-beta1v5.5.05.5.0Jan Kundrát2015-03-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a followup change for recent changes in QtGui which now handles a situation where there are no outputs, and hence a nullptr QScreen comes haunting us. Thanks to Martin Gräßlin for pointing out where the problem is, and to Richard Moore for explaining how to fix it. Change-Id: I8f70c7a0b232073d4edb55b29eb19dae9fc09413 Reviewed-by: Richard J. Moore <rich@kde.org> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | | Bump versionOswald Buddenhagen2015-02-241-1/+1
|/ / | | | | | | Change-Id: If6cfd950e87bb5b6ef49321774859af8a069e36c
* | Update copyright headersv5.5.0-alpha1Antti Kokko2015-02-1611-52/+52
| | | | | | | | | | | | | | | | | | 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: I5b54cb4819a4d35dd9136d4250f83871bd15c449 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-02-133-3/+3
|\ \ | |/ | | | | Change-Id: Id4f88960be38e50cbc5d3cc18e217eef183e0238
| * Doc: corrected link issues qtx11extrasv5.4.25.4.2Nico Vertriest2015-02-042-2/+2
| | | | | | | | | | | | Task-number: QTBUG-34810 Change-Id: I53cb5667bf9ae5ec0b01f36ea02b3fb04a486fb5 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * Doc: link issue to qmakeNico Vertriest2015-01-191-1/+1
| | | | | | | | | | | | Task-number: QTBUG-43810 Change-Id: I08d1de90da5817fadf2d6bf1e51f3e2da6453c80 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-01-190-0/+0
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I11c9042973955404311b85abe037125daf00d4bf
| * Bump versionOswald Buddenhagen2015-01-161-1/+1
| | | | | | | | Change-Id: I9c91d525e03efd727f12eb7910a75c1b856dc718
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-01-020-0/+0
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I222537ffb88473069d8cea5a98d6955e7756898d
| * Bump versionv5.4.15.4.1Oswald Buddenhagen2014-12-121-1/+1
| | | | | | | | Change-Id: I7c3dd0e59483a96f087a4d345cb279e99bce77fd
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-10-090-0/+0
|\ \ | |/ | | | | Change-Id: I92b5fcb258f0277e7d570d4bb9fc45627792aa1e
| * Merge remote-tracking branch 'origin/5.3' into 5.4v5.4.0-rc1v5.4.0-beta1v5.4.05.4.0Frederik Gladhorn2014-09-160-0/+0
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I6359e74f475d169dbc8a1d7bbb4784b0fc45e87b
| | * Bump version5.3Frederik Gladhorn2014-08-291-1/+1
| | | | | | | | | | | | Change-Id: Ie22937bab88b96f5d60509eb956a794a983b4c63
* | | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-08-289-777/+528
|\ \ \ | |/ / | | | | | | Change-Id: Ibf8b681e5501561add1a02ba99b82056a4d4b102
| * | Update license headers and add new licensesv5.4.0-alpha1Antti Kokko2014-08-249-777/+528
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: I173cdbf20a35132737586a9cdbfc2a6f209f6d6a Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* | | Bump versionOswald Buddenhagen2014-08-091-1/+1
|/ / | | | | | | Change-Id: I25abde51b070a8d27748de77aad6b42ab13c27ad
* | Doc: Removing url variable from qdocconf file.Jerome Pasion2014-07-071-1/+0
| | | | | | | | | | | | | | -url inherited from the url variable set in qtbase/doc/global Change-Id: I8f79cadaa601ab1644a0f36cdfef7b271f39f65c 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: I8150980a590b864feb41d90ba09bbcbac8da8225
| * Bump versionv5.3.25.3.2Oswald Buddenhagen2014-06-181-1/+1
| | | | | | | | Change-Id: I25a398434f4fcc0ee50cc698d65a40ebd7e2f196
* | Merge remote-tracking branch 'origin/5.3' into devSergio Ahumada2014-06-140-0/+0
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Id4d3d030c5cb609a4b7ad03c5496a9a5625d46c5
| * Bump MODULE_VERSION to 5.3.1v5.3.1stable5.3.1Sergio Ahumada2014-04-221-1/+1
| | | | | | | | | | Change-Id: Ic12bff4a564117f7e566e8880ed66046be5ea07d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | QX11Info: add nextStartupId/setNextStartupId - for startup-notificationDavid Faure2014-04-123-0/+79
| | | | | | | | | | | | | | | | | | | | This controls what the next window to be shown will send as startup-notification message. http://standards.freedesktop.org/startup-notification-spec/startup-notification-latest.txt Change-Id: Ia1b5e6ba004d61ca6fdfd6683d2e22dfcd0c42fb Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Richard J. Moore <rich@kde.org>
* | Merge remote-tracking branch 'origin/stable' into devIikka Eklund2014-04-012-14/+3
|\ \ | |/ | | | | Change-Id: I5e71d0948a944085be782f8a2108bc875d31db51
| * test: Remove dead code around QX11Info::setAppDpi{X,Y}v5.3.0-rc1v5.3.0release5.3.0Sergio Ahumada2014-03-281-11/+0
| | | | | | | | | | | | | | | | These functions don't exist for QX11Info. Change-Id: Icb9a4b28c1f97ac8d59c93a29633547c84f6589c Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: David Faure <david.faure@kdab.com>
| * Doc: Remove references to nonexistent functionsSergio Ahumada2014-03-281-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - setAppDpiX() - setAppDpiY() - screen() they only exist in Qt 4.8. Change-Id: Ifca7cf9712a9b822b0776f413451d6bca7c69a37 Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com> Reviewed-by: Martin Gräßlin <mgraesslin@kde.org> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-03-244-18/+12
|\ \ | |/ | | | | Change-Id: I6d27c3ef1242de08a8b9b6ee619c942982d3384c
| * Fix hard dep on widgets for autotestsv5.3.0-beta1Frederik Gladhorn2014-03-151-3/+5
| | | | | | | | | | Change-Id: I4a847eb9480eb6343fe60c71ec3e37bd6887af9f Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
View Lorry Controller Status