summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-12-111-0/+2
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I2144151d80b976ebd54c4d921a48a5a52c805352
| * fix build with non-global xcb installationsOswald Buddenhagen2018-11-121-0/+2
| | | | | | | | | | | | | | Fixes: QTBUG-71672 Change-Id: Ifec963bad7f2612146b2ea624d3c52fe24e7eb88 Reviewed-by: Rolf Eike Beer <eb@emlix.com> Reviewed-by: David Faure <david.faure@kdab.com>
* | Fix return type of appRootWindow for Qt 6Frederik Gladhorn2018-07-302-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | This is minor, but it's a bit silly to cast down to a 32 bit type in return and then cast it up to 64 bit again on the same line. The returned value is most likely used to other x11 calls which expect 32 bit. I think this is so minor that it doesn't even need a change log entry for Qt 6. Change-Id: I3b54394c7934eb62026dfcf241e983c20b7e7d9c Reviewed-by: David Faure <david.faure@kdab.com>
* | Use nullptr and shared nullFrederik Gladhorn2018-07-301-6/+6
|/ | | | | | | | | | Relying on the implicit cast for QByteArray from 0 actually does not result in returning sharedNull and is confusing to read. Change-Id: I0aeef058e9f15b9fe5a53a7ed93f378bc2c74b96 Reviewed-by: David Faure <david.faure@kdab.com> Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* Doc: Mark a \snippet entry with a .pro fileVenugopal Shivashankar2018-07-192-6/+61
| | | | | | | | | | This enables excluding the snippet from the documentation in some cases. In addition, moved the literal code blocks to a separate snippet file. Change-Id: I892bce6f249f67c06b5285244e0bf4f5701e7272 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Doc: Add license details to index pageKai Koehne2018-05-141-0/+9
| | | | | Change-Id: Ia2dac7d47542666e3c9529efb480cb6238899ceb Reviewed-by: David Faure <david.faure@kdab.com>
* Silence GCC8 warnings in qx11infov5.11.0-beta4v5.11.0-beta3v5.11.0-beta2Ville Voutilainen2018-02-281-6/+6
| | | | | Change-Id: I50fe500de9d274f1b78151992162344a25894b1d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-204-11/+184
|\ | | | | | | Change-Id: Iefeabec872d521c5788b6cde315ae87bd1c1140a
| * Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4Liang Qi2017-10-302-10/+10
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ie24e49d8396394f78f98367ad3485d2540ba3156
| | * Fix outdated FDL license headerKai Koehne2017-10-172-10/+10
| | | | | | | | | | | | | | | Change-Id: Ie88e763f3028467fdb096124118855bc82fbf88e Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * | Add QX11Info::peekEventQueue() APIv5.10.0-beta3v5.10.0-beta2v5.10.0-beta1v5.10.0-alpha1Gatis Paeglis2017-08-292-1/+174
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][QX11Info] Added new API to peek into the XCB event queue - peekEventQueue(). This enables porting certain Qt4-based applications to Qt5 (those using Xlib's event handling functions to peek into the X11 event queue). In Qt5 we set XCB to be the owner of the X11 event queue with XSetEventQueueOwner(dpy, XCBOwnsEventQueue), which means that only XCB event handling functions can be used to read events from the X server. XCB does not have an equivalent for Xlib's peeker API. For filtering out unwanted native events Qt5 provides QAbstractNativeEventFilter::nativeEventFilter(), but there isn't any API in Qt to just *peek* into the queue while the GUI thread is busy processing a long task. The peekEventQueue() function adds this capability via QX11Info. Manual and auto test included. Task-number: QTBUG-50358 Change-Id: Id31f797f7ff76d011ad7a55a9b6c13756aaaca60 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | Replace Q_NULLPTR with nullptrKevin Funk2017-09-271-1/+1
|/ | | | | Change-Id: I34495213d5484036d1943140de8df4098684882e Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Eradicate last Q_FOREACH and mark the library as Q_FOREACH-free and ↵v5.8.0-beta1Marc Mutz2016-09-231-1/+2
| | | | | | | | | | | | | | 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-141-0/+1
| | | | | | | | 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>
* Adjust to qtConfig() changes in qtbasev5.8.0-alpha1Lars Knoll2016-08-191-1/+1
| | | | | Change-Id: I15ab6f816ba30f16cac7f2e3d6ab0ebd549a3ade Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@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-222-0/+27
| | | | | | | 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>
* | Updated license headersAntti Kokko2016-01-203-44/+62
|/ | | | | | | | | | 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>
* 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>
* Update copyright headersv5.5.0-alpha1Antti Kokko2015-02-165-32/+32
| | | | | | | | | 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>
* 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>
* Update license headers and add new licensesv5.4.0-alpha1Antti Kokko2014-08-243-56/+32
| | | | | | | | | - 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>
* 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>
* QX11Info: add nextStartupId/setNextStartupId - for startup-notificationDavid Faure2014-04-122-0/+50
| | | | | | | | | | 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>
* 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>
* remove QtWidgets dependencyTasuku Suzuki2014-03-142-3/+2
| | | | | | | | | 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>
* 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>
* 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>
* Add a method to let users determine if the current platform is X11.v5.2.0-alpha1Richard J. Moore2013-09-092-0/+12
| | | | | | | | 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>
* 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>
* 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>
* 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>
* 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>
* doc: Minor changes to qdocconf filev5.1.0-alpha1Sergio Ahumada2013-04-021-2/+5
| | | | | | | | | | | - substitute fixed version numbers with variables - add url field - add version field - add description field Change-Id: Ia77b944ce13f8fe911c4fb86c52640ebf748fc99 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: David Faure (KDE) <faure@kde.org>
* Fix crash when qApp is a QCoreApplication.David Faure2013-03-261-0/+12
| | | | | | | | | | Yes, it makes little sense to call QX11Info API in such cases; but it happens currently in kio unittests which calls code which creates dialogs but never show them to the user (since they are unittests). With this fix, the tests pass. Change-Id: I96cd2080891a960aa405d98fd1801253930bde1e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Remove QT_BEGIN_HEADER/QT_END_HEADER macro usageDavid Faure2013-02-052-8/+0
| | | | | | | | These were just removed in qtbase dev. Change-Id: Id7683e7407cc4615ca3ed4bc2d262fa21bc3ba48 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* QX11Info: return unsigned long rather than Qt::HANDLE.David Faure2013-02-042-3/+3
| | | | | | | | Qt::HANDLE has changed from unsigned long (on X11) to void* (everywhere) in Qt5, so we have to use "unsigned long" explicitly here. Change-Id: I4b16d1492dcb43fde5a4637d33f049854bec898a Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* This library requires xcb, skip it on platforms where it's not availableDavid Faure2012-12-181-1/+3
| | | | | Change-Id: I5881b1d84b7e7ed0d5b2288d755abb1cb948052e Reviewed-by: Richard J. Moore <rich@kde.org>
View Lorry Controller Status