summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* XShaping drag and drop fixesAlbert Astals Cid2012-05-143-8/+267
| | | | | | | | | | | | No shaping rectangles means no interaction with the window The shaping rectangles are based on the window coords, so need to substract the window coords when checking for the point And some tests to prove this change is needed Backport from commit 07f3c1e26aa6dcd07a9705e7b2ea02ace9ea7c5d from qtbase Change-Id: I6dd6c75c2bd70463561445b4f4a3894c80981d26 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* QNetworkReply::setReadBufferSize fix for threaded httpMartin Petersson2012-05-139-6/+123
| | | | | | | | | | | | Added the setReadBufferSize functionallity again by limiting the amount that the delegate read from the channel. Each time that data is fetched from the reply buffer, we communicate back to the thread so that more data can be fetched. Task-number: QTBUG-25327 Change-Id: I08a246f4e7fbfdb8d58f4c5982ed0c9fa474f560 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* fix composition (C/KC) of some sequencesKonstantin Ritt2012-05-112-2/+15
| | | | | | | | | | | | | an unassigned code point should be treated like a starter code point; thus, if we have met an unassigned code point in the currently processed sequence, we should start process the next one (but we know there are no composed character for an unassigned starter -> simply skip it) This patch doesn't apply to qtbase, commit 46b78113b22428e6f8540193fcf0e00591dbd724 solved the same issue in a different way. Change-Id: I781a26024878d8b83a182b0fd4e681be2a6d9a27 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Wrong signals received when moving Flickable elementKatja2012-05-111-2/+2
| | | | | | | | | | Both onMovingHorizontallyChanged and onMovingVerticallyChanged received when Flickable element moved only to one direction. Fixed so that only relevant signal sent. Task-Id: QTBUG-25042 Change-Id: I20acb2403e08c2afa681da2e553cea227c91f001 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* getting started: better names for main() argumentshjk2012-05-105-10/+10
| | | | | Change-Id: Ibc9cdd89503fc085ed0441ff34cbe2f729e67066 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Always process window (de)activated eventsKevin Ottens2012-05-101-3/+0
| | | | | | | | | | | | | | | | | QApplication::setActiveWindow() is fully able to deal with null pointers for the activated window. It is in fact necessary to call it even in case of a null pointer as it is the only way to get a ApplicationDeactivated event properly queued. Without this patch no ApplicationDeactivated event get delivered when the platform plugin informs the Qt event system of the corresponding user interaction. Note: This doesn't apply to qtbase which has the proper behavior, this bug is Qt4 specific. Change-Id: I1128d0233a8f85943cfe5fc3c298a43f66b6d4aa 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>
* Avoid emitting finished() before user can connect the signalShane Kearns2012-05-091-1/+1
| | | | | | | | | | | | QNetworkSession::open can synchronously emit an error, therefore we need to queue this. Otherwise QNetworkReply::finished is emitted before the user has had a chance to connect the signals. Task-number: QTBUG-18824 Change-Id: I703d5e31d2934afafabdf0a77ea3aaf5336e8dec Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com> (backported from commit 9793dbcc4ae4f5f0976f819e6a33e82e6b24f50e)
* Connect bearer engines to manager with QueuedConnectionShane Kearns2012-05-091-4/+8
| | | | | | | | | | | | | | | | | | | This is to avoid a deadlock that happens when a user thread is accessing the QNetworkConfigurationManager at the same time the plugin emits a signal. i.e. plugin is holding engine lock user thread is holding manager lock and blocked trying to acquire the engine lock In the manager slot, it tries to acquire the manager lock. By using queued connection, there are no locks held at the time the manager slot is called. Change-Id: I95f28028b5e77f77b2b9b7e31cbd1b78a8fe3097 Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com> (cherry picked from commit 55070e863710d49dd4b09903be9a85ea94dff1fe)
* QNetworkAccessManager - ensure abort reaches QFtpShane Kearns2012-05-081-0/+3
| | | | | | | | | | Previously, we just disconnected signals from QFtp and allowed it to continue downloading in the background. Task-number: QTBUG-25494 Change-Id: I891c2fff88ef1ee554d1ccf821a3f7998eeb8406 Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com> (cherry picked from commit c6864e0a580793f29c7d2cf180fc0f2ac2fc2b2c)
* QFtp - implement fast abort for downloadsShane Kearns2012-05-081-5/+16
| | | | | | | | | | | | | | | | Most FTP servers do not support the ABOR command (they don't process control channel traffic until the data channel is finished). Or they require the telnet IP & sync procedure on the control channel (this requires sending TCP urgent data, which we do not support). Following behaviour of most browsers and GUI FTP clients, abort downloads by resetting the data channel. Abort of uploads needs no change, because the client closes the data channel rather than the server. Task-number: QTBUG-25494 Change-Id: I69e7b7c04d709d26def9a4a7081074e1cbf69701 Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com> (cherry picked from commit a5fcd3f799371239dd375150648bf77cb4745626)
* 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)
* Use reference count to close down idle network sessionShane Kearns2012-05-081-4/+4
| | | | | | | | | | | | | | | | | | QNetworkAccessManager was using the AutoCloseConnection property of QNetworkSession to close it when idle. However this property is only implemented for polling engines and not event driven engines. Instead, release the network session reference. If another request comes in, it will be resurrected from the shared session weak reference. If not, then after 2 minutes when the connection caches are flushed the ref count will reach zero and cause the QNetworkSession to be destroyed (which closes it) Task-number: QTBUG-15812 Change-Id: I2963bdf13fb02e3ac269489ea463669142f3c5f3 Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com> (cherry picked from commit 1aeaf0e7089c893a927a5ab311a6176aad5874a7)
* Remove not present networks from QNetworkInterface::allInterfacesShane Kearns2012-05-081-2/+1
| | | | | | | | | | | | | | | Windows 7 accumulates networks over time with the status "not present". This is so it can remember whether a given network was a public, home or work network next time you use it. By default, these networks are not returned when enumerating network interfaces, but we specified a flag to request all networks. These networks are generally not useful so use the default behaviour of not reporting them. Task-number: QTBUG-18824 Change-Id: I4edc4cea83a0e97a88ac649b7d8af95a8a600b89 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 360c481840ece253bf7235e901508c96a085e018)
* Symbian: fix AlignedBlockAllocator initialization on emulatorPasi Pentikainen2012-05-081-1/+1
| | | | | | | | | | | | | Correction to assert in AlignedBlockAllocator contructor. It had a typo, leading to assert against uninitialized data, which succeeded in all other environments, except in emulator urel version (which zeroes heap allocations). Task-number: ou1cimx1#998546 Change-Id: I9b8a76f1871287263483cfe09b1e962570f9990d Reviewed-by: Pauli Järvinen <ext-pauli.p.jarvinen@nokia.com> Reviewed-by: Murray Read <ext-murray.2.read@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Fix define to build without gtk style.Frederik Gladhorn2012-05-081-1/+1
| | | | | Change-Id: I750664ca0c227df4b8792536b2a0beec9c96f845 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@nokia.com>
* Removed -qt-gif -configure option from documentationKatja2012-05-081-2/+0
| | | | | | | | | -qt-gif is no longer a valid configure option, so it needs to be removed from docs. Task-Id: QTBUG-25671 Change-Id: If599a3a5596f31ba949187dddd3fd18c9b0a5b4b Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Clicking on a disabled ListView's delegate breaks mouse interactionPasi Pentikainen2012-05-083-1/+66
| | | | | | | | | | A disabled Flickable should not filter children. This is a backport of change I9f0d8fbfd0922b5c6a9eaffa69212867359f79e0, from Qt5 (later discarded in QtQuick1 restructuring of Qt5). Task-number: QTBUG-20584 Change-Id: Id279907ee90faf19284c12b548467850662a7019 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* On Symbian, use 16bit OpenGL if not enough GPU memory for 32bitMurray Read2012-05-071-55/+64
| | | | | | | | | | | | | Using 32-bit config on Symbian only when the low-memory GPU is not used. Otherwise apps that did run with this GPU and Qt 4.7, will not run with Qt 4.8. This is a follow up to 54613aec3bdac668d198923814873a9e622ad675 Task-number: ou1cimx1#997217 Change-Id: I945f10c68b40baa10e60b412b03c650d129b1dae Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Fix application font loading in basic font dbJiang Jiang2012-05-041-5/+15
| | | | | | | | | | | | | | | | | | | We need to reregister fonts in initializeDb because basic font db doesn't have an internal record like fontconfig does, so just repopulating the font database won't work. db->reregisterAppFonts is now used properly as intended (reregister application fonts after the system font database has been cleared). Also, static variable 'initialized' in initializeDb() is removed since we check privateDb()->count to see if it needs to be populated again. Task-number: QTBUG-22063 Change-Id: Ifc66392b56b72acbe08b99256c61421c204be5d7 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> (cherry picked from commit 89cfe9eb01ad75c14121dbd6038b7c791226acf1) Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Fix for clipped Vietnamese characters when typed with VKBMarko Kenttala2012-05-042-0/+109
| | | | | | | | | | | | | Adding tone marks with VKB to Vietnamese vowels caused them to be clipped from top. Added character conversion to Symbian VKB handling so that correct characters without clipping are used. Task-Number: ou1cimx1#981433 Change-Id: Iaf9f2ce9f5cf42e74cac100658025eb6e20e6487 Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Fix Symbian key event code mapping in QSymbianControlRiikka Inkila2012-05-041-1/+1
| | | | | | | | | | | | | | | | Symbian key events that represent characters/symbols whose Unicode values are above the value range of S60 special keys are currently mapped incorrectly to S60 special key events within QSymbianControl class. This must be fixed as Symbian AknFEP can nowadays deliver character input from virtual keyboards to FEP-aware text editors only by simulating a corresponding key event and virtual keyboards can obviously contain characters and symbols whose Unicode values are above the S60 special key value range. Task-number: ou1cimx1#979068 Change-Id: I57c4e87f6a532641ece7d45f29d3956ebb25b736 Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Add missing colon to tests/auto/auto.proRoy Mickos2012-05-041-1/+1
| | | | | | | | | | The pro file has a missing colon in the last line regarding help.pro. Although the intent was to exclude it from symbian compilation, the missing colon caused that it was dropped from all platforms. This fix will bring it back, while still excluding it from symbian. Change-Id: I3cf05505d969182556458272cf10bc8847476468 Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Pass configured timeout to callWithCallback too.David Faure2012-05-041-1/+2
| | | | | | | | | This was missing in ccf3b9e48b2d773999a9a88e249f79380618cde6. Backport of ac86c8397ceca7c46de6f104c7031716e053f9fb Change-Id: Ia473ef581db91506ea72e777a727d4b786ae3fee Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix unit confusion in ccf3b9e48b2d773999a9a88e249f79380618cde6David Faure2012-05-042-6/+12
| | | | | | | | | | | I wrote nonsense in that commit. The older methods that take a timeout all take milliseconds, and the comments in the unit test really meant milliseconds, not seconds. 1s is not shorter than 100ms.... Backport of 972464262166752df0015fe1209a7ab307cc7105 Change-Id: I3539cf196848b483b8c3a96b45851a465fc2dfcb Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix compilation error on old Unix systems caused by ShapeInputSergio Ahumada2012-05-031-1/+3
| | | | | | | | | | Change 33bb996c83e541c26df632b3e8883a1190cc97f0 caused a build error on Solaris/HP-UX (at least) as ShapeInput type is not present in default system headers. Change-Id: I6e19351651856ed71bc9ceaeae625ceac74b27b0 Reviewed-by: Albert Astals Cid <albert.astals@canonical.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* Fixed crash issue in QtDBus if D-Bus not installedTero Ahola2012-05-031-1/+1
| | | | | | Task-number: QTBUG-23128 Change-Id: Iba47ddf2fbbfa56499c4c4e28899190f6b63efac Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix atomics on SPARCThiago Macieira2012-05-031-8/+8
| | | | | | | | | | Inspired by https://bugreports.qt-project.org/secure/attachment/26020/qt_atomic_sparc64.patch Task-number: QTBUG-22479 Change-Id: Ie3275df96c639d6a75e05f70fe5745aeb34457f9 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> (cherry-picked from commit 01ee0985319a0f41be12c3c8ff3813a74b43835e)
* mkspecs: Define compilers and linkers elsewhere for freebsd-g++46.Raphael Kubo da Costa2012-05-031-4/+10
| | | | | | | | | | | | | | | | Commit ae2060dc56501ab387863757c3fd90d5cfed7dd2 has made the freebsd-g++46 mkspec use g++-base.conf, which on its turn resets QMAKE_CC and QMAKE_CXX to other values. Redefine them to gcc46 and g++46, respectively (and fix the linker values) after the inclusion of g++-unix.conf so the settings are not lost. Cherry-picked from f42a61e76ac209db0bfeefdb03de22ce26b422bf to qt5/qtbase. Change-Id: I005bab3bc79ca3a0dc1b2d3a70d058b77c304f46 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* 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>
* Updated WebKit to a096458b01a9387719308c99e5917a7b42196078Simon Hausmann2012-05-034-7/+33
| | | | | | | | | | QNX fixes for https://bugs.webkit.org/show_bug.cgi?id=77013 and http://trac.webkit.org/changeset/109105 backported by Nicolas Arnaud-Cormos <nicolas.arnaud-cormos.qnx@kdab.com> Change-Id: I4b57f26bac6ed61a8a48ea6ef4c2dedf0503675b Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com> Reviewed-by: Zeno Albisser <zeno.albisser@nokia.com>
* 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>
* Fix auto-detected QNX mkspec paths in configureSamuli Piippo2012-05-031-2/+2
| | | | | | | | Removing 'unsupported' from QNX mkspec paths in configure when it auto detects missing platform and xplatform arguments. Change-Id: Icc180a0c1cb226865e3f416ae50eec16523114b5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Use BPS based event handlingKevin Krammer2012-05-039-2/+399
| | | | | | | | | | | | | | | | 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>
* test: Mark test as significant on platforms other than Mac OS XSergio Ahumada2012-05-021-1/+1
| | | | | | | | This test only fails on Mac OS X at the moment, so enabling it for all the other platforms. Change-Id: I1e816e9b7bbae802c868e31b367b7e43bd673d87 Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* test: Mark test as significant on platforms other than WindowsSergio Ahumada2012-05-021-1/+1
| | | | | | | | | This test only fails on Windows at the moment, so enabling it for all the other platforms. Task-number: QTBUG-25563 Change-Id: I42d1bf9046a643c12385ce3bc6d88572216691b4 Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* configure: Escape '{' in getQMakeConf2 functionSergio Ahumada2012-05-021-1/+1
| | | | | | Change-Id: I7df0ca940a76b80d7b0da24dbedbabd2b8736bb8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit 62185f07f8ac1515b9e884452b33978c5a521549)
* test: Remove insignificiation from qxmlquery test on WindowsSergio Ahumada2012-05-011-2/+0
| | | | | | | This test has been always passing in the last 10 runs. Change-Id: I8c0be5bd8430544853df1b0b77bf229b76a0668b Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove build_all when target is same for debug and releaseSamuli Piippo2012-04-3016-3/+71
| | | | | | | | | | | Change build rules for projects where both debug and release target are the same file. For these, it makes no sense building both targets, as they overwrite each other. Now build only release target, when build_all is used. Change-Id: Iffd1076028b1cc91e8151c346bf4761772dafe65 Reviewed-by: Simo Fält <simo.falt@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* test: Remove insignificiation from qhttpnetworkconnection test on WindowsSergio Ahumada2012-04-301-2/+0
| | | | | | | This test has been always passing in the last 10 runs. Change-Id: I3dac52588c7032935957bf2f258353116d320ba3 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* test: Remove insignficiation from networkselftest test on WindowsSergio Ahumada2012-04-301-2/+0
| | | | | | | This test has been always passing in the last 10 runs. Change-Id: Ic867f786104f118008cf810df21ac6e68438c881 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Fix crash with evaluation licenseSamuli Piippo2012-04-271-7/+2
| | | | | | | | | | With QWS, an infinite loop is formed at application startup when commercial evaluation license is used and QT_EVAL is defined. Change-Id: Ia8e9a02c95e7277f49cf4866bae2422e6cef7973 (cherry picked from commit bf3c3862b486bbc472117d8e11e03f621b11c064) Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix bug that made some autotests unrunnable on INTEGRITY targetKalle Viironen2012-04-278-19/+3
| | | | | | | | | | | Some autotests had else:integrity { patrs that defined SRCDIR so that those tests were unrunnable on INTEGRITY. This patch removes those defines. Task-number: QTBUG-24176 Change-Id: I26d3ee60c825fc57a60df1a7177176585733d099 Reviewed-by: Rolland Dudemaine <rolland@ghs.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Fix memory leak in 64-bits ODBC driverHonglei Zhang2012-04-271-1/+2
| | | | | | | | | This fix complements the commit 8c28db8cda. A similiar function call was forgotten in the previous fix. Task-number: QTBUG-25256 Change-Id: I38880e755a78951985484b718c89ac43a6dc2b4c Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* Compile on Mac OS X with unsupported/macx-clangBradley T. Hughes2012-04-272-2/+2
| | | | | | | | 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>
* Fix crash in TextEdit when changing text content.Andrew den Exter2012-04-271-1/+1
| | | | | | | | | Verify the text cursor is not before attempting to deference the layout it refers to. Task-number: QTBUG-25389 Change-Id: I8a75393c5af9f81821ad91cbfdd7bbca0d84b1a2 Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Take account of spanned items in QTreeView when dragging.Stephen Kelly2012-04-262-32/+42
| | | | | | | | | Also remove some code which has been unused since it was introduced in 32182d107fa75e5619ecc91a81f50626f429ebe1 Task-number: QTBUG-25140 Change-Id: I27f9496c2c998de7ea858b943c2f19d979ef18c2 Reviewed-by: David Faure <faure@kde.org>
* 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>