summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add change file for Qt 5.6.3v5.6.35.6.3Liang Qi2017-09-061-0/+12
| | | | | | | Task-number: QTBUG-62728 Change-Id: Ifd59f592eec630a78104dcc22d2cdee0c0c18238 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 90d5d612bc7b3450a7a9d5c37c2de1d150f95182)
* Binary compatibility file and global.cfg for QtX11ExtrasMilla Pohjanheimo2017-02-062-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> (cherry picked from commit aa43efab9b7a9bad002ebc5e2ede061f641cb90e)
* Bump versionOswald Buddenhagen2016-11-281-1/+1
| | | | Change-Id: I2b96b89d8b4f9e1f2353a6844133bcf62f26cdcb
* 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>
* 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
* 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
* 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>
* | | 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>
| * remove QtWidgets dependencyTasuku Suzuki2014-03-143-4/+3
| | | | | | | | | | | | | | | | | | The module doesn't depend on QtWidgets any more. Change-Id: Ic8036ec1ee53ef8b1a3bb6c827fb815f322865a2 Reviewed-by: Martin Gräßlin <mgraesslin@kde.org> Reviewed-by: David Faure <david.faure@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Use nativeResourceForIntegration "rootWindow" to get the appRootWindowMartin Gräßlin2014-03-081-11/+4
| | | | | | | | | | | | | | | | As the native interface can provide the root window it's better to use that instead of going through QDesktopWidget. Change-Id: I0a7b475b5ef2a802f603b29762bf2d9033dfa13d Reviewed-by: David Faure <david.faure@kdab.com>
* | Bump module version to 5.4.0Thiago Macieira2014-02-201-1/+1
|/ | | | | | Change-Id: I319a14c993f2c85937c66fe59c49303ba7227aec 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: I9b3732bd9c128ec862b0b9a91881f44322142479
| * Bump MODULE_VERSION to 5.2.2old/5.2Sergio Ahumada2014-01-161-1/+1
| | | | | | | | | | Change-Id: I0b7a838780530e8c4c06692da21dbf92a016c391 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-11-290-0/+0
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Icab7fb1dd11851639a46b2cb211ded5df92a1dbe
View Lorry Controller Status