summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Collapse)AuthorAgeFilesLines
...
* Enable MT screen event handling on BlackberryRafael Roquetto2012-06-263-12/+38
| | | | | | | | | | | | | | | | | | Consuming incoming screen events through the BPS event dispatcher on its current incarnation has proven to be very inefficient since it cannot put up with the screen event throughput. This patch enables the screen event thread also for Q_OS_BLACKBERRY platforms, in addition to stock QNX. This behavior can still be configurated through the project file, though. Task-number: QTBUG-26177 akin to qt5/qtbase: 9e66ee2d59d28d61e06e5c57485f1a331b82f269 Change-Id: I307b805f125d0eb213b21b3ef4476c4df5d6a853 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix virtual keyboard setHeight() for BlackberryPeter Hansen2012-06-192-2/+2
| | | | | | | | | | Applies to Qt 4.8 only. Task-number: QTBUG-26160 Change-Id: I4a110ade1f817cc5d9a866e57e1d710abd83d143 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* [Blackberry] Fix deletion of dangling pointersRafael Roquetto2012-06-191-1/+2
| | | | | | | | | | | This bug affects only Qt 4.8 series. Task-number: QTBUG-25796 Change-Id: I42c9bf5e8778e9bac2bb10c8e5888e02a61f72d7 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
* DirectFB: Improvement for QDirectFBPaintEngine::fill()Marcel Schuette2012-05-301-12/+9
| | | | | | | | | | | | | | | | | | | Improvement for bug fix related to QTBUG-23850 in QDirectFBPaintEngine: combine the conditions for an accelerated fillrect (5 elements and rectangle shape) in first if-statement. The previous check for NULL pointer solves the problem for the crash, but it simply skips the type check (which caused the crash before) and the or-condition (shape) became true and leads to an accelerated fillrect. Otherwise it would fallback to raster. The original reason for the crash (elemets is null) might be Q_DISABLE_COPY macro of QVectorPath, especially with the last lines of the Q_DISABLE_COPY documentation, which could become true on embedded devices, where DirectFB is often used, with special toolchains/compilers. Task-number: QTBUG-23850 Change-Id: I340291fbce24260c7522684305c292e66cfc32af Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* QNX: Special case z-ordering of the QDesktopWidget windowSean Harmer2012-05-211-1/+11
| | | | | | | | | | | | | | | | | The assumption that window creation order implies correct initial z-ordering is broken when dealing with certain window types. In this commit we special case the QDesktopWidget's window which maybe created after normal application windows yet still need to be layered below them. Without this fix we may accidentaly activate the Desktop window when the blackberry navigator service sends an event to activate the window group. That results in broken focus handling. Backport of b09d601261244395450557187adeed6717f25155 (qtbase) Change-Id: If7c4b1ac9d99dc5a9b7d0e7b3e2080c648cf85b3 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Advertise window (de)activation to Qt event systemKevin Ottens2012-05-103-0/+34
| | | | | | | | | | | | | The integration plugin now connects screens to the newly introduced signals of the navigator event handler. The relevant screen then push a corresponding event to the Qt event loop. (This is a backport from qtbase commit b6a4d69830c0d188b4f6c424808390dd8e3a90bc) Change-Id: I28c8843f2aea75bc685dcfd6e005bc628bc69202 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Emit signals to notify window (de)activationKevin Ottens2012-05-104-0/+46
| | | | | | | | | | | | | The event notifier now deals also with the windowActive and windowInactive PPS messages. The event handler simply emit the corresponding signals. (This is a backport from qtbase commit f74e5a03598e102a1d81eb4fca58e41db713e5dc) Change-Id: If9ae70d132e6a38a2dd728d8eba31dfd144e9978 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Windows 7 - fix nativewifi bearer pluginShane Kearns2012-05-082-7/+21
| | | | | | | | | | | The plugin code only handled the 2 events from windows XP, while there are more events defined on vista/7. As the scan complete event was being ignored, updates did not complete. Task-number: QTBUG-24503 Change-Id: Ib1fd6883b0fd6962f61dab7830e577b9292163ef Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com> (cherry picked from commit b45f0418e34a73da1729376c540b312b14b8ffda)
* Add implementation of virtual keyboard based on BPS eventsKevin Krammer2012-05-038-43/+339
| | | | | | | | Backport of a818a1eb2f3d2c5ac61da7e1a8cf1b341e63aed1 Change-Id: I32bc78eb465890702cbf657b077fdf1f8e8e4a63 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Handle navigator events in BPS event filterKevin Krammer2012-05-033-4/+81
| | | | | | | | Backport of 050ff2730c96831aedb5897a60eafaf13ae8d93e Change-Id: Ida0566e88d5f53ea879a7fd2bda6746814b4e365 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Register for and handle screen events delivered through BPSKevin Krammer2012-05-038-52/+100
| | | | | | | | | | | | Delegates actual event inspection and reaction to the screen event handler class already used by the PPS screen event handler Backport of e212d25972dbc19e3cc687b8c7bd4503eec8a602 Change-Id: I0e7f2fb91bedd0b5200d90b9e67be55ec9386dde Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Use BPS based event handlingKevin Krammer2012-05-035-2/+192
| | | | | | | | | | | | | | | | Create a QPA specific subclass of the blackberry event dispatcher (basically the BPS equivalent to QPAEventDispatcherGlib or QEventDispatcherQPA. Create an event dispatcher event filter that will receive all BPS events and then either handle them itself or delegate to event subtype specific handlers. Backport of fa94f01489611f2c72d1678b4d9439a584e7c4f9 Change-Id: Ie51c064c5ef1faca04e09a4f7ff35069ff6afda5 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Compile on Mac OS X with unsupported/macx-clangBradley T. Hughes2012-04-271-1/+1
| | | | | | | | Clang does not allow implicit const to non-const conversion like gcc does. Fix this. Change-Id: I1448975e1935a54405c20851841f0559c7bb9d3d Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
* Use non-blocking reads on virtual keyboard pps device.Kevin Krammer2012-04-261-1/+6
| | | | | | | | Backport of 5c882dbb8955e3bcbd77027aae379aca50e9dfaa Change-Id: Ic9724138775cc2a33ec8a3279950c1332b9adbcf Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Do not force OpenGL sample buffers on in the qnx qpa pluginSean Harmer2012-04-231-1/+0
| | | | | | | | Backport of 4c0289c337f7793ec2f6b65bb3493f7299f8e4ef from qtbase Change-Id: I871629356adf081197bc89e9f28801e5da517c5e Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* directfb: Use QPlatformPixmap::fromFile for Qt resourcesHolger Hans Peter Freyther2012-04-191-8/+2
| | | | | | | | | | | | | | Move to fromFile to load Qt resources for two reasons. The first is that ::fromData creates a QBuffer on our raw data and is passing that to the QImageReaders. Right now we there is a QFile -> QByteArray -> QBuffer transition that wastes cycles. The other reason is that QPlatformPixmap::fromData did/does not check if the decoded image is null and might cause a crash because of that. Change-Id: I800bfe4cd9b5d6a0d3531ed33f4228770703e94f Original-Id: I7cb92d84874323e7205ab28883cc0fe9ecca1e27 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Bump Qt version to 4.8.2aksalova2012-04-181-1/+1
| | | | | | | | Change-Id: Iecae324b1ae00c0d6fb6ed36a8f4a27f51a31d07 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Simo Fält <simo.falt@nokia.com> Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Refactor navigator event handlingKevin Krammer2012-04-167-207/+348
| | | | | | | | | | | | | | | Separate PPS based navigator event notification handling and implementation of the actual event handling. Like the similar refactoring for screen events, this will allow to reuse the same event handler class for BPS driven event processing. Backport of 4fac40f8b0e7b2a6f5f41eb82196e8b197bc851a Change-Id: I6896645aedd20e96fdabc7c49c7bd1d762de788f Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Fix crashes in QAccessibleTree::navigateFrederik Gladhorn2012-04-131-1/+7
| | | | | | | | It's a best practice to return 0 when the iface is invalid. Change-Id: I6dd70b53b975b10b75c246e6f8f7681da2bcb785 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Accessible interface for QPlainTextEditJosé Millán Soto2012-04-133-8/+83
| | | | | | | Added QAccessiblePlainTextEdit, as an accessible interface for QPlainTextEdit Change-Id: If0269a49b9fcd1b3e9fcfd32fac912560df28f21 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* Use parentheses in statement with && and ||.Frederik Gladhorn2012-04-131-1/+1
| | | | | Change-Id: I4f968559a7371b87343cb5825eb83b0099364cf2 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Fix possible crash issue when testing the state of a QAccessibleMenuItemYan Shapochnik2012-04-131-2/+2
| | | | | | | The owner widget of a QAccessibleMenuItem may be NULL. Checking for a valid pointer before dereferncing. Change-Id: Ic3149ccc5d6ae0ebc83dae58163ae2f60397fd28 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* Use QPointer to store accessible object.Frederik Gladhorn2012-04-112-86/+98
| | | | | | | | | Itemview were not following the established pattern of keeping the referenced object in a QPointer. This made them a lot more crash prone. Change-Id: I210b112b9c3647b246fde2d6c69aba9ce8d25bd3 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Fix compilation when QT_NO_CURSOR is definedRomain Pokrzywka2012-04-102-0/+7
| | | | | Change-Id: Iacf8ef2032d5c229a7483d6993120684ee9bb04e Reviewed-by: Jeremy Katz <jeremy.katz@nokia.com>
* Move handling of rotation changes from event handler to screenKevin Krammer2012-04-045-20/+25
| | | | | | | | | | | | | | | | Have the navigator event handler emit the new rotation as a signal argument and let the screen class handle all parts of the change, i.e. also notifying the window system about the geometry change. This also allows to rotate all screens, not just the primary screen, if this should be necessary. Backport of 45b7b0599cd1ebdfe17487215b36ff766068f0e8 Change-Id: Ia3e3ff321bc2d7a23e64950d15d88d007f9766dd Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Add a native interface with the ability to query the window groupThomas McGuire2012-04-035-3/+168
| | | | | | | | | | | The window group is needed by QtMobility, as the BB multimedia API requires the window group when creating a video overlay window Change-Id: Ifc029c31b5a1750631a6b397f7c33aa31e483c81 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Add support for screen overlays / foreign windowsThomas McGuire2012-04-038-19/+112
| | | | | | | | | | | | | | We're not the only one creating native windows. When using the multimedia API, the multimedia library creates a video window for video display. Here we need to deal with giving this video window overlay a proper z-order, otherwise it will never get visible. Cherry-picked from qtbase 4efd61c3cf3d25db1c60bf5c842837c5b24a05fa Change-Id: If2e2a6e51ae6553fdf645e578f68e41c7b43336a Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Make everything in QBBScreen non-staticThomas McGuire2012-04-036-110/+127
| | | | | | | | Cherry-picked from qtbase b5f343b3677a7c7f09d91d7d60f310717325e840 Change-Id: Idf7176bd83215f1251c1e2200a5bf0168adfe523 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Fix platforms.pro scope to match all QNX platformsRafael Roquetto2012-04-021-1/+1
| | | | | | | | cherry-picked from qt5/qtbase: d5bc8ab811f380116c5a55a777150bc47a43a6bb Change-Id: I8d2f906c52ae56ec5cfce70f94ec3661e7d0e15f Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Separate virtual keyboard interface and implementationKevin Krammer2012-04-0110-109/+252
| | | | | | | | | | | Allows us to create a BPS based implementation and drop it in without further changes to users of the interface. Backport of 831943d7f12addef79fb536e5550da0f72480217 Change-Id: Ib047f4bbc68743cfe8c2293a235d4e9ca8195af9 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Move screen event processing into its own classKevin Krammer2012-03-306-514/+653
| | | | | | | | | | | | The event handler class can then be reused when we have proper BPS event support available from corelib Backport of a80a2c6da241dac77f533bc702a1c7d94349a812 Change-Id: I9f8f661ca6b976aa02990bc8c8af8e5472e5faa4 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Refactoring virtual keyboard class into non-singletonKevin Krammer2012-03-3010-64/+93
| | | | | | | | | | | | | | | | Getting rid of the singleton gives us better control over when the virtual keyboard handling class is instantiated and configured. Also notify screens about keyboard height changes and let them notify through QWindowSystemInterface instead of "guessing" the screen in QQnxVirtualKeyboard. Backport of 5d117fd427e3e727df5d3f417a2b91366f2a31c1 Change-Id: I49c1a6af5decca47a5ab3ba382430a2b25578d40 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Support QDesktopServices on BlackBerry platformsRafael Roquetto2012-03-291-0/+12
| | | | | | Change-Id: I10506b83efda8efb12ccc531f60cd4cd9b4b5bc9 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Make QNX virtual keyboard handling main event loop drivenKevin Krammer2012-03-222-86/+90
| | | | | | | | | | | Refactor from polling in an endless loop running in a separate thread to using a QSocketNotifier working on the main thread. Backport of 29518b04a619fdd7784e88eebe687fb87ae8a8b5 Change-Id: I8993b874f1543d5e85b0911c81a7a9ec072e5160 Reviewed-by: Sean Harmer <sh@theharmers.co.uk> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Use main thread event loop for navigator event processingKevin Krammer2012-03-225-71/+53
| | | | | | | | | | | Removes the need for an extra thread by creating the event handler's socket notifier in the context of the main thread. Backport of 9dc86ac0f2d019f93665c1ae0e3c2cd33fd88bce Change-Id: I5c31d904191f45698085e8fd576481018e072ef4 Reviewed-by: Sean Harmer <sh@theharmers.co.uk> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* TGA imageformat: fix broken canRead plugin functionAlexander Anokhin2012-03-191-3/+5
| | | | | | | | | | Plugin is now moving QIODevice pos to 0 before exiting from canRead function, so it doesn't break other existing imageformat plugins functionality. Task-number: QTBUG-24201 Change-Id: Ib58b0458215cf5ad705dffa0aaf6a7463d1f089e Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* BlackBerry Plugin: support 8 mouse buttons, instead of just 3.Kevin Krammer2012-03-091-3/+10
| | | | | | | | | | | | | | | | The mask of possible mouse buttons in QNX provides tracking for the up/down State of up to 8 mouse buttons. This update adds support or 2 of buttons which we previously ignored in Qt on this Platform. Backport of a0933f4d7485d22f38b80c67f79b8d3f721b19a2 in Qt5/qtbase reduced to the 5 buttons Qt4 has support for Related to task-number: QTBUG-24682 Change-Id: I4253b96b2d7ed3f806749432b2eb7f884fd0f580 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Rick Stockton <rickstockton@reno-computerhelp.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* Use QSocketNotifier instead of sleeping in an endless loopKevin Krammer2012-03-092-35/+51
| | | | | | | | | Event driven listening for navigator events, basically a backport of the respective QPA plugin code in Qt5/qtbase Change-Id: I120a755af614d35a9e5a0e755c521bbf8bf0d13d Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Fix platforms.pro to match new qnx mkspec nameRafael Roquetto2012-03-091-1/+1
| | | | | | | | | cherry-picked from Qt5/qtbase 4ba895a86 Change-Id: Ic15d00df4b83d4510ea9622d74e988515fbfbae5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Sean Harmer <sh@theharmers.co.uk> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Improving clipboard integrationKevin Krammer2012-03-062-44/+157
| | | | | | | | | | | | | | | | Derive a data accessor class from QMimeData so application level code can query MIME type availability through it or directly attempt to fetch data by MIME type even if the type is not yet known to QBBClipboard. Also make sure any MIME type used by the application in setMimeData operations is checked for availability when being queried for formats. This is a backport of 08cc2d27794e6bafb75cdc35b6966def35f9facb in master of Qt5 qtbase Change-Id: I86455cfb58e2e00ac3e992a8228ee7167f8d2a20 Reviewed-by: Sean Harmer <sh@theharmers.co.uk> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Add egl include paths and link lines to eglfs.Girish Ramakrishnan2012-03-061-0/+11
| | | | | | | Similar to the code in gui/egl/egl.pri. Change-Id: I1dbcf6f0d70405d8dc9f404bfed64fdfcd7c14ab Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* React to changes of focus widgetKevin Krammer2012-03-052-0/+15
| | | | | | | | | | | Needed to automatically show/hide virtual keyboard when focus changes in or out of an input widget Change-Id: I21325452938e1d551bcc4421721f3bc5d85c5fbf Reviewed-by: Sean Harmer <sh@theharmers.co.uk> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Nick Ratelle <nratelle@qnx.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Bump Qt version to 4.8.1Girish Ramakrishnan2012-03-051-1/+1
| | | | | | | | Change-Id: I117e5dcd45397a9fbd1f033fc745ada00c221721 Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Simo Fält <simo.falt@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fixed missing parenthesesRobert Loehning2012-03-051-1/+1
| | | | | | Change-Id: Ic0a2f9bb6a1d59261240fc0de85d6db52974c964 Reviewed-by: João Abecasis <joao.abecasis@nokia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* Fixing z-ordering of windowsKevin Krammer2012-03-021-1/+1
| | | | | | | | | | | | | | The application root window is at z-order == 0, all platform windows created for Qt windows are its descendants, so their base value for z-order needs to be 1. Backport of qtbase 117bdad3f270a4c0589cff332a7a8e904263de08 Change-Id: Ic1fb91c30559177bc094a5db96e4088860a8d6ac Reviewed-by: Sean Harmer <sh@theharmers.co.uk> Reviewed-by: Nick Ratelle <nratelle@qnx.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Fixed handling of keyboard info messages.Kevin Krammer2012-03-021-3/+3
| | | | | | | | | | | | | Country and language values were assigned to in the case of decoding failure but left unchanged in case of success. Thus members mLanguageId and mCountryId remained at "en" and "US" respectively instead of being changed to whatever the keyboard sent. Change-Id: I9f48a55d3c431458426c5c4da8e69600948f219b Reviewed-by: Sean Harmer <sh@theharmers.co.uk> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Nick Ratelle <nratelle@qnx.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Include blackberry QPA plugin when building for blackberry make specKevin Krammer2012-03-021-0/+3
| | | | | | | Change-Id: Ia756609ed4406deacf92e15b4e6591a91ef5c8a6 Reviewed-by: Sean Harmer <sh@theharmers.co.uk> Reviewed-by: Nick Ratelle <nratelle@qnx.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Fix xcb-icccm 3.8 supportGirish Ramakrishnan2012-03-011-0/+25
| | | | | | | | | | | | Build fix on platforms having xcb-icccm >= 3.8 This is a backport of 7ce8491280990350162933a0716d1b014f65aeb6 and f005dee1b3692a09e47782dcff9b5b07aa659b51 from qtbase. Change-Id: Ic6cbb555335a74cc7b00273081c249aa7e08afaf Reviewed-by: Holger Freyther <holger+qt@freyther.de> Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix static build of Qt for WinCE and WEC7.Janne Anttila2012-02-271-2/+0
| | | | | | | | | | | | | | | | | When doing a static build of Qt for WinCE/WEC7, the sqlite database driver is statically built into Qt library. In that case relevant HAVE_LOCALTIME_S=0 defined in sqlite.pro under plugins folder does not have effect because qsql_sqlite.pri and further 3rdparty/sqlite.pri are directly included to QtSql library. Moved the needed define down to such *.pri file which is included in both static and non-static Qt builds. Task-number: QTBUG-24500 Change-Id: Iacbdd6d02fc31558a1ce91f42756eaac5053414b Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Port QBBRootWindow from the Qt 5 QPA plugin.Robin Burchell2012-02-255-222/+375
| | | | | | | | | This lessens unnecessary delta between the two. Change-Id: I3bb33d977573e3404dd08c2f4e396d18dd63ddc7 Reviewed-by: Sean Harmer <sh@theharmers.co.uk> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>