summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * Bump MODULE_VERSION to 5.2.1v5.2.1Sergio Ahumada2013-11-251-1/+1
| | | | | | | | | | | | Change-Id: Iee840bb9cf19e8aeb219dd579ad75595270e407e Reviewed-by: Matti Paaso <matti.paaso@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2013-11-081-1/+1
|\ \ | |/ | | | | Change-Id: I1155f08deee98516e021a21c54132292d27aabdc
| * Doc: Updated url variable in qdocconf files.v5.2.0-rc1v5.2.0Jerome Pasion2013-11-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In 5.2, the HTML output is in a flatter structure and when they are hosted in qt-project.org/doc, the documentation will be found at http://qt-project.org/doc/qt-$QT_VER The url variable is used by projects outside of Qt 5 which need to link to Qt 5 documentation, such as Qt Creator. Task-number: QTBUG-34584 Change-Id: I9ec7609bfeae7bcf393b61941052f921fc328db7 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-10-111-2/+15
|\ \ | |/ | | | | Change-Id: I39296b426d6e7555db5087e720066fad02ffc5d3
| * Properly get X screen application is running on in appScreenv5.2.0-beta1Martin Gräßlin2013-10-011-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDesktopWidget does not provide the X screen number. No matter on which X screen an application is started, QDesktopWidget returns 0. Therefore resolve the X screen through the native interface's x11 screen resource. The documentation is improved to make it more obvious that this is about the X screen and not the RandR screen. Change-Id: I0f78a728769cbdfcac8b67b4fd5de0934f498027 Reviewed-by: Richard J. Moore <rich@kde.org> Reviewed-by: David Faure <david.faure@kdab.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-09-301-3/+4
|\ \ | |/ | | | | Change-Id: I1a43928ab6b5c1458c1f662896e022b24bf38ee1
| * Update the git-archive export optionsSergio Ahumada2013-09-301-3/+4
| | | | | | | | | | | | | | | | | | | | The .gitattributes, .gitignore, .commit-template files do not need to be present in packaged sources, as they are for people using the Git repository. People who download tarballs usually don't reimport into Git -- they should just download the actual repositories. Change-Id: I04d2ca436f5174c7820b42b6f5b2b9648c925fe3 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* | Bump qtx11extras version to 5.3.0Sergio Ahumada2013-09-241-1/+1
|/ | | | | Change-Id: Ia76fecdcc02044219fee9d2cd492f05630995000 Reviewed-by: David Faure <david.faure@kdab.com>
* Add a method to let users determine if the current platform is X11.v5.2.0-alpha1Richard J. Moore2013-09-093-0/+21
| | | | | | | | In order to know if the methods in QtX11Extras are usable the user should have a way to tell if they're running on X11. Change-Id: I096267eb1f1fe07ee11811574a96100389c33b7d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Add convenient method getTimestamp to QX11InfoMartin Gräßlin2013-08-122-0/+21
| | | | | | | | Provides access to the getTimestamp method in the XCB plugin which allows users to retrieve the current X timestamp. Change-Id: Ib6acd44c8ff899265ed6826f36b88fe427ff58c3 Reviewed-by: David Faure (KDE) <faure@kde.org>
View Lorry Controller Status