summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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>
* 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>
* disable module when widgets is not availableSergio Ahumada2013-04-041-0/+2
| | | | | Change-Id: Ic9744c2bd451d37cbad57a8c4074e71756c6e00a Reviewed-by: David Faure (KDE) <faure@kde.org>
* 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>
* Bump MODULE_VERSION to 5.1.0Sergio Ahumada2013-03-261-0/+2
| | | | | Change-Id: I7fcc161bc0e513a1983b071aba70b931765b039f Reviewed-by: David Faure (KDE) <faure@kde.org>
* sync.profile: Point dependencies to 'refs/heads/stable'Sergio Ahumada2013-03-261-1/+1
| | | | | | | This is a leftover from the master branch split into dev and stable. Change-Id: I342ea38c427ccabdf002cec4ea579d727fcff2a5 Reviewed-by: David Faure (KDE) <faure@kde.org>
* Add and modify the mandatory license file to be consistent and properLaszlo Papp2013-02-164-0/+1660
| | | | | | | | See the following mailing list thread for further details: http://lists.qt-project.org/pipermail/development/2013-February/009810.html Change-Id: Idceda4c038b1200d0c3745eb8faafa5d56ab4240 Reviewed-by: David Faure (KDE) <faure@kde.org>
* Remove QT_BEGIN_HEADER/QT_END_HEADER macro usageDavid Faure2013-02-050-0/+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>
* qtx11extras: updating sync.profile to point to qtbase devDavid Faure2013-02-050-0/+0
| | | | | Change-Id: I40396034c6c132a76c6fd6c0247cc2515cb5a8bd Reviewed-by: Sergio Ahumada <sergio.ahumada@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>
* qtx11extras: updating sync.profile to point to qtbase devDavid Faure2013-02-051-1/+1
| | | | | Change-Id: I40396034c6c132a76c6fd6c0247cc2515cb5a8bd Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* QX11Info: return unsigned long rather than Qt::HANDLE.David Faure2013-02-043-5/+5
| | | | | | | | 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>
* Skip tests too on platforms without XCBDavid Faure2012-12-211-1/+4
| | | | | | Change-Id: I87821d698ea50359b63da569818a2ded6ee865d8 Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Richard J. Moore <rich@kde.org>
* QtX11Extras: Adding missing license headerSimo Fält2012-12-191-0/+40
| | | | | | | | CI will run the license header check as a pre-build test, if it detects missing headers it will exit with failure. Change-Id: Ib080373c92e4715747d6a75139821de270108e61 Reviewed-by: David Faure (KDE) <faure@kde.org>
* QtX11Extras: sync.profile, using stable branch instead of masterSimo Fält2012-12-191-1/+1
| | | | | | | QtBase deosnät have master branch anymore, so using stable instead. Change-Id: Ibc35dbc39cd3445b36234c6fa5c326ca5f694077 Reviewed-by: David Faure (KDE) <faure@kde.org>
* 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>
* Rename "support" to "extras" everywhere, to match the new module nameDavid Faure2012-12-1811-31/+31
| | | | | Change-Id: Ic089aa287b38b756bb9f0bc252c4120859afcefa Reviewed-by: Richard J. Moore <rich@kde.org>
* Port to the version of the appTime/appUserTime that got merged in.David Faure2012-12-181-8/+12
| | | | | | | (60bd2156f81 in qtbase) Change-Id: I95fabfba2d47e4d5e65df03cb95b0fe1fb69d6a7 Reviewed-by: Richard J. Moore <rich@kde.org>
* Add unit tests for the cmake files.Stephen Kelly2012-12-075-1/+56
| | | | | Change-Id: I2e07862e0e13d8a9747691d219185edbe6c86274 Reviewed-by: David Faure (KDE) <faure@kde.org>
* Implement appTime and appUserTime (getters and setters) on top of QPA.David Faure2012-12-055-13/+183
| | | | | | | | | Add unit test for QX11Info, taken from Qt4 and extended. Change-Id: I22f403f47bb5413b954c06f8cb78992e02726f6d Reviewed-by: Richard J. Moore <rich@kde.org> Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Johan Thelin <johan.thelin@pelagicore.com>
* Initial creation of the qtx11support library.David Faure2012-12-0512-0/+615
| | | | | | | | | | | | | | This implements QX11Info again, for source compat with Qt4, on top of the XCB QPA backend. The API and the documentation are forward-ported from Qt4 (minus things that cannot be implemented anymore). The implementation, however, is new (by Richard Moore, in this initial commit). Change-Id: Iff9fd16fa6aaaa54f6d3cc0843b6b6fd08d5b1fb Reviewed-by: Richard J. Moore <rich@kde.org> Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Initial empty repositorySergio Ahumada2012-12-040-0/+0