summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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>
* Merge branch 'stable' into devSergio Ahumada2013-08-051-0/+25
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I3d5b05b358cd18ad85fa9ea42f94a312f81d91f5
| * Merge remote-tracking branch 'origin/release' into stableold/5.1Sergio Ahumada2013-07-261-0/+25
| |\ | | | | | | | | | Change-Id: Ic32f2f1327095555b9694fffe960af4e27f5ce21
| | * Add changes-5.1.1 filev5.1.1Sergio Ahumada2013-07-231-0/+25
| | | | | | | | | | | | | | | Change-Id: I1052732f56c234f6c57fa74f4a2ba8cd46ae8081 Reviewed-by: David Faure (KDE) <faure@kde.org>
| * | Bump MODULE_VERSION to 5.1.2Sergio Ahumada2013-07-241-1/+1
| |/ | | | | | | | | Change-Id: Iaeb5409a4caf23533209425a07231da346570fce Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Doc: Setting \qtvariable in module page.Jerome Pasion2013-08-021-1/+1
| | | | | | | | | | | | | | \qtvariable indicates the QT variable needed in .pro files. Change-Id: I11a7cfa2d72f0dcc3056152c00283670ffcef947 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Doc: Setting navigation variables for the navigation bar.Jerome Pasion2013-06-261-1/+4
| | | | | | | | | | | | Change-Id: I0c53e5e14f01f39ccefe9fdc38e0680d7691fcbe Reviewed-by: David Faure (KDE) <faure@kde.org> Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-043-7/+6
|\ \ | |/ | | | | | | | | | | | | Conflicts: .qmake.conf sync.profile Change-Id: I5738cd6ace4c7896fae45d1922c9a6b44a8eac78
| * Bump MODULE_VERSION to 5.1.1Sergio Ahumada2013-05-291-1/+1
| | | | | | | | | | Change-Id: I228c33151b38d46bf27d131a715ea00fce795c56 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * sync.profile: Point dependencies to an empty stringv5.1.0-rc2v5.1.0-rc1v5.1.0Sergio Ahumada2013-05-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | This means that we are going to use the same branch name for the dependencies as the branch of the repository under test. If we are testing the 'stable' branch, all dependencies will point to the 'stable' branch as well. Change-Id: I81ec5d9ef660ebd3f69bee74a95b8af0164cdeba Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
| * Doc: Fix module inclusion detailsSze Howe Koh2013-05-242-6/+4
| | | | | | | | | | | | | | | | | | - Show the correct "QT +=" option - Use a camel-case header (for the module's sole class) instead of an actual filename Change-Id: I9e030effe7ab34df1a877e1de327fb1e789c645a Reviewed-by: David Faure (KDE) <faure@kde.org>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-04-294-17/+130
|\ \ | |/ | | | | Change-Id: I63c17e85c104c7a01abd351a8fd80a194f16691c
| * Doc: Fix module name in .qdocconfv5.1.0-beta1Topi Reinio2013-04-261-15/+15
| | | | | | | | | | | | | | | | | | Use CamelCase for module name(s) used in in .qdocconf - this is required as qdoc will generate visible output (tags in example manifest files) based on these names. Change-Id: I11ddda5e3c15e9986ce132314d6acfa6839cab1b Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Doc: landing and module page for Qt X11 ExtrasNico Vertriest2013-04-123-2/+115
| | | | | | | | | | | | | | | | | | Ingroup statement in qx11info_x11.cpp Removed trailing whitespace Change-Id: I03c16014f66a809f1c31b4501ffd1ca0691b5ee7 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-04-122-34/+22
|\ \ | |/ | | | | Change-Id: Icc39210a3f41d4ea35cb678a8b3a872052819b9b
| * doc: Minor changes to qtx11extras.qdocconfSergio Ahumada2013-04-081-34/+20
| | | | | | | | | | | | Change-Id: I0f8e6b3c4dc6a7ab00f69a0ce38e74d14b46c41a Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * disable module when widgets is not availableSergio Ahumada2013-04-041-0/+2
| | | | | | | | | | Change-Id: Ic9744c2bd451d37cbad57a8c4074e71756c6e00a Reviewed-by: David Faure (KDE) <faure@kde.org>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-04-031-2/+5
|\ \ | |/ | | | | Change-Id: I73c2bccfee6f3ea0099fa565bbf2e9d2c65096a8
View Lorry Controller Status