summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Use utf8 to store audio device names in win32 backend.Lev Zelenskiy2012-07-031-3/+3
| | | | | | | QTBUG-21398 Change-Id: I9a319d4365b1fa26b6b4f63baf7c97e26df4f482 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Added support for big endian data to QAudioOutput win32 backend.Lev Zelenskiy2012-07-031-0/+25
| | | | | | | | Convert data from big endian to little endian. QTBUG-19881 Change-Id: Id98c2158ed056dd89fe2656e8f262d4b37f94eb7 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Allow frequences up to 96000 in win32 backend.Lev Zelenskiy2012-07-032-2/+2
| | | | | | | QTBUG-26102 Change-Id: I08377d49a444ca3db1d1c0ccabc00665b4480f9b Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Clean buffers before closing the input device.Lev Zelenskiy2012-07-031-6/+7
| | | | | | | | Input device handle is invalid after waveInClose() QTBUG-24119 Change-Id: I3b2554f816f5ca66be4d992a0a579561639caf9f Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fix access to uninitialized pointerTobias Hunger2012-07-031-1/+1
| | | | | | | | | | | | The C++ standard says in 9.4..2 that the object expression is evaluated, so any compliant compiler may access d. So this syntax is a bug in this place. This is a backport of commit 88cf9402e336fddeb673c92f3c14da47a9f8450b from qtbase. Change-Id: I02a9a1b73f7c18e8342aafeae412759f78086fa6 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Enable smiley support for Symbian editorsMarko Kenttala2012-07-022-1/+22
| | | | | | | | | | Added enabling of CEikEdwin::EAvkonEnableSmileySupport flag for normal Symbian editors so that smiley/emoticon button or menu is enabled. Change-Id: I0b9f6205ca1521fc54d3b688ccd1225823263aac Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com> Reviewed-by: Jaakko Helanti <ext-jaakko.helanti@nokia.com> Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
* Change default Content-Type for http POST to match 4.7.4Shane Kearns2012-06-281-2/+5
| | | | | | | | | | | | | | | | | Qt 4.7.3 sent no Content-Type header by default. This was fixed independently on 4.8.0 and 4.7.4 branches, with different defaults. Since this is often used for web service logins, the 4.7.4 default of x-www-form-urlencoded seems more likely to work. The warning message is left in place, since not specifying the content type is still an application bug. Task-number: QTBUG-23350 Change-Id: I30bf50fd216ee9894d0168e904cea1ed4251ec68 Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com> (cherry picked from commit 4f578d15fe2ef176f0533c7ff4aea99b17636f85) Reviewed-by: Laszlo Papp <lpapp@kde.org>
* QNX: Flush after changing rotationThomas McGuire2012-06-281-0/+4
| | | | | | | | | | | This fixes a painting glitch where the window would stay in the old position with the old rotation until it got repainted. This is a backport of commit c196f89b7e298252944680bf0ba230a33feef718 from qtbase. Change-Id: Idbbcd706befef0aadb3f79ab412b41f487ae978b Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* 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>
* Item.mapFromItem() crashes with Items not created by the engine.Martin Jones2012-06-261-2/+4
| | | | | | | | | | Item.mapFromItem() and Item.mapToItem() get the script engine from the item they are called on. Safer to use the script value passed to the function to determine the engine being used. Task-number: QTBUG-26280 Change-Id: Id9d6c952cc91c7799910b29a27e24945d8ba073b Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* rewind macro in WinCE wrongly substituted.Martin Jones2012-06-261-0/+8
| | | | | | | | | qdeclarativestateoperations_p.h gets wrong macro substitution by rewind(fp) macro when compiling for Windows CE Task-number: QTBUG-26227 Change-Id: I228ab17ee0be0e228d0c782bfb48ad5c8b12169f Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Updated WebKit to 0b63152ae5d572c4a817a53210d8907f3dd11bd7Simon Hausmann2012-06-257-995/+1089
| | | | | | | | | | Fresh import from qtwebkit-2.2 branch that includes -Werror fix The bison changes are due to a local bison upgrade. Change-Id: I61a413a5550c748c56b39362e2a0f67c321afb4d Task: QTBUG-23987 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Fix possible crash when copying QImage.Kim Motoyoshi Kalland2012-06-251-1/+1
| | | | | | | Task-number: QTBUG-14766 Change-Id: I0b9ec19ea43355e04a12f2dc0244b22b575fab44 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Fix infinite recursion while dragging toolbar of QMainWindow.Markku Heikkila2012-06-251-2/+3
| | | | | | | | | Prevent recursion in QMainWindowLayout::endSeparatorMove(). Task-number: QTBUG-21378 Change-Id: Ie40005a35918d4da7ef911f8c3b1d1c3b5cf4fd2 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Updated WebKit to 2dea2a19feedc165596b933fe9509ddd0caf4d15Simon Hausmann2012-06-2512-277/+29
| | | | | | | Includes version bump and backport of build fix with newer glib versions Change-Id: I42a7c6c835b3d7ae6e79f30f308b350b67dd1e7b Reviewed-by: Zeno Albisser <zeno.albisser@nokia.com>
* Ensure that Proxy-Connection: Keep-Alive is respected for HTTP 1.0Andy Shaw2012-06-241-1/+2
| | | | | | | | | | | | | When doing a NTML authentication it would close the connection after the second phase before replying when the reply was a HTTP 1.0 version reply. Since the Proxy-Connection header is set to Keep-Alive in this case we want to ensure we do not close in this siutation. Task-number: QTBUG-26037 Change-Id: Icaaf2277efc0d05a946c52fb42b5191964e2e0fe (cherry picked from commit bd5ef309ba831740fd8475b2f7415f30c1a18be8) Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* qtdbus: Export org.freedesktop.DBus.Peer interface when introspectedDaniele E. Domenichelli2012-06-221-0/+9
| | | | | | | | | | | | | | | | | | The ofD.Peer interface is automatically implemented when an object is registered on DBus, but the ofD.Introspectable.Introspect method does not show it. You can test it by running $ qdbus --literal <some service> <some object> \ > org.freedesktop.DBus.Peer.Ping $ qdbus --literal <some service> <some object> \ > org.freedesktop.DBus.Peer.GetMachineId Change-Id: I7062ba0cdae486d443011ee19cf3874aabf90205 (cherry picked from commit 7767eed7d678dbd51d3857e6d8353f249ab5487a) Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Enable building with older SHAPE extension, or -no-xshape (QTBUG-24653, ↵Daniel Richard G2012-06-221-0/+6
| | | | | | | | | | QTBUG-25281) Change-Id: Idbd6671fdd665b9368709832f99bc42d2d9a1f84 Reviewed-by: Milla Pohjanheimo <milla.pohjanheimo@digia.com> Reviewed-by: Albert Astals Cid <albert.astals@canonical.com> Reviewed-by: Daniel Richard G. <skunk@iSKUNK.ORG> Reviewed-by: Andrew Stanley-Jones <andrew.stanley-jones@nokia.com>
* Removing potential crashes from out-of-thread cleanup on SymbianMurray Read2012-06-214-8/+48
| | | | | | | | | | | | | | | | | | | | There have been some crashes seen on Symbian when its adoptedThreadMonitor attempts to clean up objects created in other, now dead, threads. Some of these objects simply can't be cleaned up properly outside of their original thread, so the thread has to be checked when they are cleaned up, and cleanup skipped in the wrong thread. For pthread created threads, we also have the ability to insert cleanup code during thread shutdown. This was used in the 4.7 implementation of QThread on Symbian, and is a better solution for pthread based adopted threads as it gives in-thread cleanup. So the appropriate pthread code is also used with changes to adoptedThreadMonitor so that it can run along side the pthread cleanup code. Change-Id: Iad8207879b1ece62e5cce85f26a616166aa22486 Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Restored native behavior when moving cursor from selectionRobert Loehning2012-06-201-0/+8
| | | | | | | | | Reverting changes from 1b031759ddfdab9703dfecac13f1ed318da3dafe except for Mac Task-number: QTCREATORBUG-7215 Change-Id: I8570c4bd35daf8b5820507a9399d33d00f96d41b Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* Mac: Fix rendering of non-int sized fonts.Eike Ziller2012-06-192-17/+24
| | | | | | | | | Scrolling happens in integer steps, so it's necessary to use a fractional correction value. Task-number: QTCREATORBUG-7127 Change-Id: I1b027d2482b7daac83ddc8cac64d2a4449de257c Reviewed-by: Matthias Ettrich <matthias.ettrich@nokia.com>
* Drag and drop icon does not update correctly on Windows.Markku Heikkila2012-06-192-3/+2
| | | | | | | | | | | | | | | | | | | Drag and drop icon does not update correctly because WA_acceptDrops attribute is not checked on DragOver event. Drag and Drop icon does not update itself appropriately when the cursor enters an invalid drop area. Icon is not updated because WA_acceptDrops attribute is not checked in dragover. Also removed lines which force parent widget WA_acceptDrops to true, if child widget sets it to true. No autotest, because QTestlib does not support drag and drop. All examples under Drag and drop have been manually tested though. Task-number: QTBUG-22987 Change-Id: I0c2b9dc7292db7710c5585d99790514329c2db8e Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Avoid crash cancelling timer in wrong thread on terminateMurray Read2012-06-191-1/+1
| | | | | | | | | | | | | | | | | | When the Symbian timer active object detects that it is cancelled in the wrong thread, it was issuing a qFatal. But that was an overreaction, as the situation is not necessarily fatal if the thread in which the timer lives is about to die. For example if QThread::terminate is used outside of the thread targeted. Instead a debug message should be issued so that if there is a crash, the programmer should get information as to why. The debug message, in this case, is issued with RDebug::Print to avoid the use of Qt's message output which itself was crashing in partially finished thread situations. Task-number: ou1cimx1#1006699 Change-Id: I7d192eb27ba85ba2ef4f80fec3d8479f0df8f90c Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Performance fix for OpenGL drawingPauli Jarvinen2012-06-192-7/+0
| | | | | | | | | | | | | | | | | | Excessive calling of glFlush() was causing a performance problem when QML application was being run in the OpenGL graphics mode. There was an unnecessary call to glFlush() in the function QGLWindowSurfaceGLPaintDevice::endPaint(). This function gets called each time a QPainter instance is destroyed, which may happen several times per each painted screen frame (at least 4 times per frame can easily happen). Calling glFlush() from endPaint() is not necessary at all since it will be anyway called from QGLWindowSurface::flush() (either directly if single-buffered context is used or indirectly by swapping buffers if double-buffered context is used). Task-number: ou1cimx1#957423 Change-Id: I89509d8935ad31cc47bfed41a1900b6bb76c2af8 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Fix qatomic inline asm for x32 ABI.Davide Pesavento2012-06-191-3/+3
| | | | | | | | | | Drop the 'q' suffix from x86_64 asm instructions. It's not needed, because the assembler can automatically determine the proper size based on the target, and it is in fact causing compilation failures on x32. Change-Id: Ie6ff3ddf352a63bc490acce97a3019ce2e48dc70 Reviewed-by: Thiago Macieira <thiago.macieira@intel.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>
* Speedup for QAbstractItemViewPrivate::delegateForIndexABBAPOH2012-06-191-4/+11
| | | | | | | | | | | This fix prevents copying of a QPointer on a stack and adding/removing QMetaObject guards Backport of the ed776e367099754af6436f07d72352e6b73124da commit in qtbase Change-Id: Ie92fe1e7ac2c8d15be67404521040bf1a64b9c9a 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>
* AbstractItemView editorForIndex/indexForEditor speedupABBAPOH2012-06-151-1/+9
| | | | | | | | | | | | Frequent calls to editorForIndex/indexForEditor are very slow because of an implicit conversion from QModelIndex to QPersistentModelIndex. This fix allows to avoid unnecessary conversions when there are no open editors (most common case) Backport of the 1d859ef80540ec3dd64f4f7bda3a8e415965650c commit in qtbase Change-Id: Id4f8c985b824a83019dc8a8543dee69c12004faa Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* QWizard/Win: Handle hit testing correctly for Vista styleJonathan Liu2012-06-151-37/+48
| | | | | | | | | | | | | | | Clicking the area just below the close button when Aero is enabled reveals duplicate caption buttons. DwmDefWindowProc returns hit results for DWM caption buttons but DefWindowProc may also return hit results for non-DWM caption buttons. To resolve this issue, if DefWindowProc returns a window button hit result then we just use HTCLIENT (the client area) as the hit result instead. Change-Id: Ia741ce4f9aa944109d8de54c2f84009f5ea1883f (cherry picked from commit 9ab445d264fbcf57c48374526905a2f870de06a3) Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* UCD 5.0: Apply Unicode Corrigendum #6Konstantin Ritt2012-06-131-788/+789
| | | | | | | | | | | | | | http://unicode.org/versions/corrigendum6.html: > in Unicode 5.0, the list of characters with the Bidi_Mirrored property > was made consistent for brackets and quotation marks, in preparation for > new constraints on bidi mirroring. However, after publication of > Unicode 5.0.0 it was discovered that this change adversely affected > several quotation mark characters in deployed data. Task-number: QTBUG-25169 Change-Id: I2cd6a70a69f4b2c37a3f191e05233854a16f10d1 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Symbian: disable OpenVG as default on Symbian emulator buildsPasi Pentikainen2012-06-131-1/+1
| | | | | | | | | | | Symbian emulator shows QML applications badly when OpenVG graphics system is used. This fix ignores OpenVG graphics system default configuration when built for emulator target. Task-number: ou1cimx1#1005008 Change-Id: I63fb89c5074e03fd582bfbbccca55f33473285c3 Reviewed-by: Pauli Järvinen <ext-pauli.p.jarvinen@nokia.com> Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* QWizard/Win: Drag window on Vista with only left mouse buttonJonathan Liu2012-06-091-1/+1
| | | | | | | | | The QWizard window should only be draggable using the left mouse button on Vista. Change-Id: Ie6ec118cbb48440c5dc6b84c4361119b1bbbd0cf Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> (cherry picked from commit dfe598716158ef7d5a800f69a65fc982a246a318)
* Fix QFile append on windowsShane Kearns2012-06-092-2/+10
| | | | | | | | | | | | 1. make windows file engine seek to end on open to match unix/symbian 2. make qfile forcibly seek the file engine in case a custom file engine has the same bug. Task-number: QTBUG-25906 Change-Id: I62a26519a9401e547ff77bd8a71027cb361dc671 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* Mac: Remove "unsupported" warning for 10.8Morten Sorvig2012-06-081-1/+4
| | | | | | Change-Id: I4e4447af16ab1aaa6b7a6eecf2e55718e4fb69d4 Reviewed-by: James Turner <james.turner@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Add Blackberry path for SSL certificatesNicolas Arnaud-Cormos2012-06-071-0/+1
| | | | | | | Change-Id: I64a7f7aeca3954db615cc69c87048bc6ee386b88 Backport of <b002c7a8c06750e58e6d88f6a6052055eddcc9ed> from Qt5 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Richard J. Moore <rich@kde.org>
* Mark the testSslOption method as introduced from Qt 4.8Laszlo Papp2012-06-071-0/+2
| | | | | Change-Id: I49bbac754c65f80c9c614072ab2fec9f738a906a Reviewed-by: Richard J. Moore <rich@kde.org>
* QDeclarativeTextInput sends delayed mouse events to input contextLauri Malmi2012-06-071-3/+13
| | | | | | | | | | | | | | | QDeclarativeTextInputPrivate::sendMouseEventToInputContext() now forwards also the delayed press events (sent by QDeclarativeFlickable) to Input context. In case of delayed event QWidget pointer in QGraphicsSceneMouseEvent parameter is null and QApplication::focusWidget() is used to obtain QWidget pointer. Task-number: ou1cimx1#1001264 Change-Id: Ia595af651c322b0c91f3a2bd93a9ac1111a00cf6 Reviewed-by: Pauli Järvinen <ext-pauli.p.jarvinen@nokia.com> Reviewed-by: Martin Jones <martin.jones@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* QNAM - maintain a weak reference to the QNetworkSessionShane Kearns2012-06-064-31/+49
| | | | | | | | | | | | | | | | When handling signals from the session, a pointer is needed. Also the QNetworkReplyImpl needs to access the manager's session. So, the manager should have a strong and weak reference. The strong reference is held during connection establishment. The weak reference is held all the time, though it will become null when the session is destroyed in idle. The non static member function getNetworkSession() is used to create strong references from the weak reference where required. Task-number: ou1cimx#1004278 Change-Id: I4b5b36b1d996b98e659d993969006c61b4440c15 Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com> (backported from commit bae1613c4c3d8c38b90ed2ba5c1b149e1bc87987)
* Track active network replies without qFindChildrenShane Kearns2012-06-062-1/+7
| | | | | | | | | | | | | | | | For bearer management to work correctly, we need to know when there are no network replies active. Previously this was implemented using qFindChildren, but that doesn't work when the user reparents QNetworkReply. QtWebkit does this (actually sets parent to 0). Also the qFindChildren implementation was racy if multiple requests were finished in parallel. Again, likely to be triggered by webkit loading page elements. Task-number: QTBUG-15812 Change-Id: I181a9ba6611c7c4b6fffa2d84fe4029d89e8f596 Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com> (cherry picked from commit 3580168c3e357c2289acddc5f2515a3ad306ef2b)
* Windows: Fix uic3 autotest.Friedemann Kleint2012-06-021-2/+4
| | | | | | | | | | | | | After 39f2c09d9154e00409c73c6f6db90a4ddb06b8f0, Windows applications of type Gui/Tty (uic3) would emit many "QPixmap: Cannot create a QPixmap when no GUI is being used" when initializing the cursor cache, breaking the stderr checking of the test. Task-number: QTQAINFRA-428 Change-Id: Iac74fd7af905e462ac2063c58dfcd91a6b0759a7 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Fix dangling pointer issue in QGraphicsItem focus handlingPauli Jarvinen2012-06-011-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When focused QGraphicsWidget is being hidden, it tries to move the focus to next focusable widget by calling focusNextPrevChild(true). If there is no such widget available, the focus is cleared altogether. The logic used to rely on the return value of focusNextPrevChild to decide if clearing the focus is necessary. This was incorrect because the return value may be true also when the focus has actually moved within the graphics widget in question rather than moving to the next widget. This is the case at least when GraphicsWebView item is focused. Thus, the focus could then be left on invisible item which was a serious issue: elsewhere in the qgraphicsitem.ccp, it is assumed that no visible item can point to invisible item with its subFocus pointer. Such pointers will become dangling pointers once the pointed graphicsitem is deleted, and the process will then crash as soon as the focus is tried to be moved to another item. Now, the logic has been modified so that it is explicitely checked after call to focusNextPrevChild if the item being hidden still has the focus. If this is the case, the focus is cleared. To be consistent, the same logic is applied also when disabling a QGraphicsWidget. Having focus on disabled item is not as severe issue as having it on invisible item, but it is still wrong. Task-number: ou1cimx1#995710 Change-Id: Ica32bc381befc3ccaac79fb4cf4d50c5d452fad0 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Eliminate QTreeWidget drag crashJiewen Wang2012-05-311-1/+1
| | | | | | | | | | | | | In QTreeViewPrivate::adjustViewOptionsForIndex() wrong index had been used when referencing to array of viewItems. Variable row is set to the index of the QModelIndex, however it is not as same as the index in viewItems[] when there was hidden item in treeWidget. Index of viewItems[] should be used here. Unit test is added as well. Change-Id: Ie129cb63445bf1239ef7c5b2bc61b04dd9e81982 Task-Id: QTBUG-25333 Backport of <3be6ca3ee8c2c72f85b26a57538fd329ed811261> from Qt5 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* QStatusBar::showMessage will always take new timeoutJiewen Wang2012-05-311-2/+0
| | | | | | | | | | | | There is a message check in QStatusBar::showMessage causing the call exits early if the new 'message' is the same as the current message. The check has been removed, and new timeout will always take effect. Unit test is added as well. Change-Id: Id3d6ed15104d4d40c1cd2c76444c30badc8b1b72 Task-Id: QTBUG-25492 Backport of <7381328bcc37283be97eedddc24c46be1e38490e> from Qt5 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.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>
* Propagate left key presses to the parent item when TextInput is empty.Marcel Schuette2012-05-301-1/+1
| | | | | | | | | | Don't overwrite the ignore value once it's been set to true. Backport from Qt 5.0 to Qt 4.8 (commit a7017465152d544a4217d5ce4f6f84b80cb9b8b9) Task-number: QTBUG-25447 Change-Id: I2232806b1235b0c901aab21116b5bc70c65d0500 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Updated HID drivers for INTEGRITYKalle Viironen2012-05-302-178/+298
| | | | | | | | | This patch icnludes new INTEGRITY keyboard and mouse drivers. Task-number:QTBUG-24175 Change-Id: Ifbb01357a601c44bab5961cdfe82d1c7bd44b889 Reviewed-by: Rolland Dudemaine <rolland@ghs.com> Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Fix crash when using aliases and variantsNicolas Arnaud-Cormos2012-05-251-1/+1
| | | | | | | | | | Right now, the parser crash when using id.variant.property for an alias. The current patch fix the crash, and it displays an error message in the console now (like QtQuick 2). Task-number: QTBUG-25341 Change-Id: I5e2c13f487655fd2b90129c5693f5daf3f77984b Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
* Fix bug when destruction fields in QWizardCarl Schumann2012-05-251-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry-picked a70b8d407e1ca46e5dc208580534feee7ddfe51a from Qt5's qtbase master branch. Maintain the consistency of QWizardPrivate's two members: QVector<QWizardField> fields; QMap<QString, int> fieldIndexMap; during and after calls to QWizardPrivate's void _q_handleFieldObjectDestroyed(QObject *) member function. The failure to maintain this consistency caused an out of bounds access and core dump in QWizard's field(const QString &name) member function. QWizard's field(const QString &name) member function expects the values in the QMap fieldIndexMap to be indexes into the QVector fields. Prior to this change _q_handleFieldObjectDestroyed only removed the appropriate entry from the map and erased it from the vector. It did not decrement by one all the indexes greater than the index that was removed from the map and erased from the vector in the rest of the map. For example ... So if initially have the following mapping ... "field0" -> 0, "field1" -> 1, and "field2" -> 2 with fields of size 3. After destruction of "field1" have ... "field0" -> 0, and "field2" -> 2 with fields of size 2. Now attempts to look up "field2" using QWizard::field will have an out of bounds error and possibly core dump or trigger an internal Qt assert because an attempt to access this->fields[2] will be made. It should be accessing this->fields[1], but does not because the map is no longer consistent with the vector. This change adds a decrement by one for all the indexes greater than the index that was removed from the map and erased from the vector. Task-number: QTBUG-25691 Change-Id: Ia2a41027628a65faec4ecdd5da235ddd19746a57 Reviewed-by: Shane Kearns <shane.kearns@accenture.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Add OS version detection for windows 8Andreas Holzammer2012-05-242-0/+6
| | | | | | | | | | Based on consumer preview, the internal version is 6.2 backported-from: I9d6ff6c7614f46a20d489e8a8f4aefeb60c547f6 Change-Id: I543148c22cec622ad04e6bf436acd0e66cbf02d2 Reviewed-by: Shane Kearns <shane.kearns@accenture.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
generated by cgit v0.12 at 2025-02-01 18:22:46 (GMT)