summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.9' into 5.105.10Liang Qi2018-01-181-0/+25
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I99628cda14bb3747fe0964021cb6abe7a0945dea
| * Add changes file for Qt 5.9.4v5.9.45.9.4Antti Kokko2018-01-051-0/+25
| | | | | | | | | | Change-Id: Ifc3e2570184c900821414ef95c060d76bab3008b Reviewed-by: David Faure <david.faure@kdab.com>
| * Bump versionOswald Buddenhagen2017-12-121-1/+1
| | | | | | | | Change-Id: Ic1be1eefa15eec3b11f6e6f878763095a5b4b970
| * Merge remote-tracking branch 'origin/5.9.3' into 5.9Liang Qi2017-11-231-0/+24
| |\ | | | | | | | | | Change-Id: I1a10e8f01638ac2d5e12b277c28520f736022904
* | | Bump versionOswald Buddenhagen2017-12-201-1/+1
| | | | | | | | | | | | Change-Id: I536d2ce99db96419bb83ce4913c9c425714d1e36
* | | Add binary compatibility file for QtX11Extras for 5.10Milla Pohjanheimo2017-12-141-0/+8357
| | | | | | | | | | | | | | | | | | | | | File to test binary compatibility for 5.10 added Change-Id: I02e51146c2d3c319391e4cfc944daf2416a4865e Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* | | Merge remote-tracking branch 'origin/5.10.0' into 5.10Liang Qi2017-12-081-0/+24
|\ \ \ | | | | | | | | | | | | Change-Id: I9804ca1321e6ba67874efee3c3c533a7114b5867
| * \ \ Merge remote-tracking branch 'origin/5.9.3' into 5.10.0v5.10.0-rc3v5.10.0-rc2v5.10.0-rc1v5.10.05.10.0Liang Qi2017-11-211-0/+24
| |\ \ \ |/ / / / | | | _ | | | Change-Id: I1cfc5e1b9aa8f3047b8084b8ae85b98cb9b40a44
| * | Add changes file for Qt 5.9.3v5.9.35.9.3Antti Kokko2017-11-131-0/+24
| |/ | | | | | | | | Change-Id: Idb27ccd16ea91c0fc4ec8689ce670363e689c3d2 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Add changes file for Qt 5.10.0Antti Kokko2017-11-131-0/+30
| | | | | | | | | | Change-Id: I3596283dc79f99b3763a152ab30624efabfcc964 Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4Liang Qi2017-10-304-10/+34
|\ \ | |/ | | | | | | | | | | 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>
| * Bump versionOswald Buddenhagen2017-10-061-1/+1
| | | | | | | | Change-Id: I948a1f253679ad608f88027584a0e1b51c5b01a2
| * Add changes file for Qt 5.9.2v5.9.25.9.2Liang Qi2017-09-281-0/+12
| | | | | | | | | | Change-Id: Ia642277037f89b4e5373a83a7d4795345dc5b9fd Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Add change file for Qt 5.6.3Liang Qi2017-09-011-0/+12
| | | | | | | | | | | | Task-number: QTBUG-62728 Change-Id: Ifd59f592eec630a78104dcc22d2cdee0c0c18238 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Add QX11Info::peekEventQueue() APIv5.10.0-beta3v5.10.0-beta2v5.10.0-beta1v5.10.0-alpha1Gatis Paeglis2017-08-298-3/+509
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-08-163-0/+16076
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I72701ec74be2b9f2eb26f0383b7795efeb37437c
| * Binary compatibility file for qtx11extras (Qt 5.8.0)Milla Pohjanheimo2017-08-161-0/+8016
| | | | | | | | | | | | | | | | Added binary compatibility file for qtx11extras. The 5.8 branch no longer exist, that's why the file for Qt5.8.0 is pushed to 5.9 branch. Change-Id: Ic3b44332544957fc7e32f0729b82183860e27188 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
| * Update binary compatibility file for Qt5.9.0 for QtX11ExtrasMilla Pohjanheimo2017-08-151-0/+8036
| | | | | | | | | | | | | | Binary compatibility file for Qt 5.9.0. Change-Id: I327b1b6e6641362c6d682b7365f95e8651ab460c Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
| * Bump versionOswald Buddenhagen2017-06-301-1/+1
| | | | | | | | Change-Id: I28d282b6d33525458a68693a340e9a304b6da186
| * Add changes file for 5.9.1v5.9.15.9.1Jani Heikkinen2017-06-221-0/+24
| | | | | | | | | | Change-Id: I5d369201adf48a2f7b9886dd9576525dfe220842 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-06-072-0/+32
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I71045f74b946a2daf85693016b444a0301ef2ea9
| * Merge remote-tracking branch 'origin/5.9.0' into 5.9Liang Qi2017-05-311-0/+16
| |\ | | | | | | | | | Change-Id: Icab7370ac5e12caa84d24ee4d386bada92c14cf2
| | * Add changes file for 5.9.0v5.9.0-rc2v5.9.0-rc1v5.9.0-beta4v5.9.05.9.0Antti Kokko2017-05-051-0/+16
| | | | | | | | | | | | | | | | | | | | | Listing important changes and bug-fixes. Change-Id: I560972c9fbf7b4d3aeaafda88e5c99d3147dca43 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Bump versionOswald Buddenhagen2017-05-101-1/+1
| |/ | | | | | | Change-Id: I322a0b7a42d2a8d75763099266770735fa87ca48
| * Merge remote-tracking branch 'origin/5.8' into 5.9v5.9.0-beta3v5.9.0-beta2v5.9.0-beta1Liang Qi2017-03-101-0/+16
| |\ | | | | | | | | | Change-Id: If54b3b14761bcb05252e882f8e5f140dfb81d54b
| | * Merge remote-tracking branch 'origin/5.8.0' into 5.85.8Liang Qi2017-01-261-0/+16
| | |\ | | | | | | | | | | | | Change-Id: Ie6c79b1e1c641a24db171882aedb083b98ee8ca1
| | | * Add changes file for 5.8.0v5.8.0-rc1v5.8.05.8.0Antti Kokko2016-12-131-0/+16
| | | | | | | | | | | | | | | | | | | | Change-Id: I7af199513d6810edb2de69b04989fdcb28328aab Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | | Bump versionOswald Buddenhagen2017-02-021-1/+1
|/ / / | | | | | | | | | Change-Id: Ie93d53c6b853356649e380feb0f1698da83ad2b1
* | | Merge remote-tracking branch 'origin/5.8' into devv5.9.0-alpha1Liang Qi2017-01-254-10/+15737
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I1adbe081b5d636690616959bbab32890a9374ac3
| * | Bump versionOswald Buddenhagen2017-01-031-1/+1
| | | | | | | | | | | | Change-Id: I068b177beb1f2924df073a6661e35563926c62aa
| * | Binary compatibility file and global.cfg for QtX11ExtrasMilla Pohjanheimo2016-12-082-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>
| * Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-262-10/+7981
| |\ | | | | | | | | | Change-Id: Iff115b9216edf478b205832187565dcda4675af4
| | * Merge remote-tracking branch 'origin/5.6' into 5.75.7Liang Qi2016-11-241-10/+0
| | |\ | | | | | | | | | | | | Change-Id: I58bb550660a02040f7d01a30d81a635391cfc804
| | | * 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>
| | * | Binary compatibility file added for QtX11Extras (5.7)v5.7.15.7.1Milla Pohjanheimo2016-10-041-0/+7981
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added the generated data files for the binary compatibility tests for QtX11Extras for Qt 5.7. Change-Id: Iaaf08e1fe7a6756ee562131cf0712c41392ae88b Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* | | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-09-234-1/+7
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I5e403aafd4ef57dbbe813f1b7e62b49b18f77881
| * | | Eradicate last Q_FOREACH and mark the library as Q_FOREACH-free and ↵v5.8.0-beta1Marc Mutz2016-09-232-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-142-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Bump versionOswald Buddenhagen2016-08-291-1/+1
|/ / / | | | | | | | | | Change-Id: I0547857941ca77d738d52f5b44c4a28198f21d7b
* | | Adjust to qtConfig() changes in qtbasev5.8.0-alpha1Lars Knoll2016-08-192-2/+2
| | | | | | | | | | | | | | | Change-Id: I15ab6f816ba30f16cac7f2e3d6ab0ebd549a3ade Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-025-4/+46
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I4752ddb590f0389bda606dfd7478cf9d26b2199c
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-014-4/+4
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ie176f84f2ff0160efa4e39491e6a86d5a8d84f20
| | * 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
| * | Bump versionOswald Buddenhagen2016-07-281-1/+1
| | | | | | | | | | | | Change-Id: I236bc99ac3e284098b88b205d6111b7559b97a82
| * | Merge remote-tracking branch 'origin/5.7.0' into 5.7Liang Qi2016-06-161-3/+19
| |\ \ | | | | | | | | | | | | Change-Id: I9dca0793fa85f3f0d92f0aff276acd816ef4aef6
| | * | Mention license change in 5.7.0 changelogv5.7.05.7.0Jani Heikkinen2016-06-091-3/+19
| |/ / | | | | | | | | | | | | | | | Change-Id: I46adeb70d6efd90cb4c3f97e33c79a6c6062edfd Reviewed-by: Sami Makkonen <sami.makkonen@qt.io> Reviewed-by: Antti Kokko <antti.kokko@qt.io>
| * | Added 5.7 changelog for QtX11Extras.v5.7.0-rc1David Faure2016-05-261-0/+26
| | | | | | | | | | | | | | | Change-Id: I636350b5931c7aa1f22a2e60cac801f8bd5731ad Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-05-241-0/+1
|\ \ \ | |/ / | | | | | | Change-Id: I3bc3ac22ef1debe50429e67780c03f2b44318b17
View Lorry Controller Status