summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Load Mac specific resources in a static buildAndy Shaw2012-09-271-1/+4
| | | | | | | | | When Qt was built statically then the Mac specific resources were not being loaded which meant some style specific images were not used. Task-number: QTBUG-25391 Change-Id: Iad538b5f1935ed1744617d6e47ae3e68aa36afac Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Avoid crash caused by drag and drop and winId()Jian Liang2012-09-271-9/+19
| | | | | | | | | | | | | | | Task-number: QTBUG-27263 QWExtra object pointer is not guaranteed to be valid in QWidget::unregisterOldDnd() since commit f6bf4b2baa91e55f40596bf3f2823b119fdfa5e0. To avoid crash we have to check QWExtra object pointer of the native parent widget before access it, and if the pointer is not valid we should check its native parent widget recursively. Change-Id: I764fea4a0826cff751dd74a0fb67e0d2971c1d49 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* cleanup CUPS tmp filesTeemu Katajisto2012-09-271-0/+1
| | | | | | | | | | | | | Set fd in openPrintDevice() so that it gets cleaned up properly in closePrintDevice(). Backported from the Qt5 commit: 99bab571b4cb41362e891f1bb1e812119701c932 Task-number: QTBUG-14724 Change-Id: I02968d597822b636078ae89566dd8ed8a948019b Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Include the signal code in the argument of (dis)connectNotify().Thomas McGuire2012-09-265-14/+18
| | | | | | | | | | | | | | | | As it turns out, the convention of (dis)connectNotify() is to include the signal prefix, i.e. '2'. Therefore add this prefix also when calling these functions from QML. Also add a unit test confirming that the C++ and QML cases are now handled the same way. This patch is not needed in Qt5, as connectNotify() and disconnectNotify() take a QMetaMethod as a parameter, not a const char*. Change-Id: I3add0fc13c60a479949cf3d31218af5fd3f546a2 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* QElapsedTimer: Fix typo in restart() documentationJonathan Liu2012-09-261-1/+1
| | | | | | | Change-Id: Iac5df9edbe16ec841f783bc5266091a6e34e9cab (cherry picked from commit 4efd73bc3ac318ec40adea2f21b3c9359ea1795a) Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Revert "Delete JS-owned QML objects right away in the engine dtor."Peter Kümmel2012-09-258-57/+23
| | | | | | | | | | | This reverts commit ecc432a5b7ae269220f86c6f0b3dd364f8643191 to fix a crash on exit. Task-number: QTBUG-20377 Change-Id: I6606ff194f2c16e06bdbbfca94e55821cf055f75 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* HTTP header may be damaged - fix, unit testTomasz Duda2012-09-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | "HTTP/1.1 100 CONTINUE\r\n" If the header from a server is splitted between two packets the first packet contains "HTTP/1.1 100" and the second one contains " CONTINUE\r\n", one space (0x20) is skipped. After processing the line looks in this way "HTTP/1.1 100CONTINUE". QHttpNetworkReplyPrivate::readStatus(QAbstractSocket *socket) is called twice, if a http header is splitted as above. The function always removes whitespace from the beginning of a packet, even if it is the second part of a http header QHttpNetworkReply returns QNetworkReply::RemoteHostClosedError due to damaged http header during processing. Task-number: QTBUG-27161 Backported qtbase/60f4fc8b706db9cbeacd5dc4886a7aa347daafc0 Change-Id: I07ec43641bbb9966285a8a1f57a51fb27d2643d4 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Fixed inconsistent rounding of square cap pens.Samuel Rødal2012-09-251-10/+10
| | | | | | | | | | | | | A horizontal line should round up at the same time as a vertical line with square cap, when rendering at subpixel coordinates. Thus, the special casing in the cosmetic stroker of offsetting by half a pixel should be for flat caps instead of for square caps. Task-number: QTBUG-26013 (cherry picked from commit 72aaba336c7afe6d79d59995bfb31a8effca4e9e) Change-Id: If7e7c6b6e37c5b1ce4685012a11fd29ff0b1df5a Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* QNX: don't show the virtual keyboard when focusing an item view.Nicolas Arnaud-Cormos2012-09-251-1/+5
| | | | | | | | | This patch is not needed in Qt5, as it works as expected. Change-Id: I3d165c3f5b8562207af20a0564c3884270d17b44 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
* float->int error in OS X Mouse Event HandlingGerhard Roethlin2012-09-241-1/+3
| | | | | | | | | | NSEvent for mouse events contain the mouse position in floating point numbers. This value is truncated/floored for mouse clicks. Qt instead rounds that value, so mouse move events can get positions that are slightly off sometimes. This solves #QTBUG-27273. Change-Id: I2d3f59a09f50cb83dc1ccf6de940b7d99087c9ee Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Rotate non maximized windowsRafael Roquetto2012-09-212-0/+109
| | | | | | | | | | | | | | | | | There are two types of rotation to be considered: 1. Rotation of native widgets The corresponding window should be rotated and resized proportionally to the new screen geometry. 2. Rotation of toplevel windows. The window will be only rotated. It will be only moved or resized if it becomes clipped, in order to be fitted on the screen properly. cherry-picked from qt5 89d9f8fe949e65e7455fabe288ea284aa6de06b1 Change-Id: I837da53f1a12a7b8aff1e0e9d6f4579e3aefaf2a Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* Fixed potential use of uninitialized variable in qgl.cppSamuel Rødal2012-09-211-1/+1
| | | | | | | | | If glGetBooleanv fails this variable is left uninitialized. Task-number: QTBUG-26952 Change-Id: Idb42833f2907bb66fd87c5cdb39753fca04e7438 (cherry picked from commit 0d55b4596f490f8f64eb3134e77e59df7d1c16f9) Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix build for platforms that use QPA other than IOSPeter Hartmann2012-09-192-2/+2
| | | | | | | | | | | For instance on Blackberry this would try to include Mac libraries as well. In Qt 5 this is still working. Change-Id: Iae9d3b7e1b988ac8932c58deabfeb249cd2cfc2e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Disable SSL compression by default.Richard Moore2012-09-193-4/+9
| | | | | | | | | | | Disable SSL compression by default since this appears to be the a likely cause of the currently hyped CRIME attack. This is a backport of 5ea896fbc63593f424a7dfbb11387599c0025c74 Change-Id: I6eeefb23c6b140a9633b28ed85879459c474348a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Peter Hartmann <phartmann@rim.com>
* Refactor coreservices -> ios & QT_NO_CORESERVICES -> Q_OS_IOSIan Dean2012-09-1818-40/+40
| | | | | | | Similar work was done in Qt5 in Change Id3b02316 Change-Id: I392d2a5bfffb9a335f28d5dbc5ea27b800fc4487 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* QNX: Enable support for hardware buttons in QPA pluginSean Harmer2012-09-175-4/+321
| | | | | | | Backport of 3f407cddf8b1d5fc09b414dbecd9a47d30e3abe7 Change-Id: Id7fd3ca76793d8d3e3698dd402fe31e04567e938 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* QNX: Add some optional debug output to event dispatcherSean Harmer2012-09-171-0/+19
| | | | | | | | Backport of 6998c4b2ad5fdf5f525bd77ec0fd3c6667b102b7 Change-Id: I32ceb7cc8e000c8fd00bf9e5ed6d6f8b796c73ad Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Fix crash when invalidating a QSortFilterProxyModelStephen Kelly2012-09-141-6/+22
| | | | | | | | Backport of d7a15fbfd93fb566c7793596ea50d8786b9eb654 from qtbase. Task-number: QTBUG-27122 Change-Id: I0b1eda292fd9648e6f08629f7a069b66bb8b59e8 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Delete JS-owned QML objects right away in the engine dtor.Thomas McGuire2012-09-148-23/+57
| | | | | | | | | | | This prevents memory leaks when the engine is destroyed after exec() has already finished. In most cases this happens during application shutdown, at which point the event loop is never entered again. Task-number: QTBUG-20377 Change-Id: I65564ed3e56314d656d92fd66f11ae67d4eb932b Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix MinGW-w64 compilationJonathan Liu2012-09-141-1/+1
| | | | | | | | | ENABLE_EXECUTABLE_ALLOCATOR_FIXED requires sys/mman.h which is not available with MinGW-w64. Change-Id: I6e76ce0c570e5819657debf813f0e80cef907dd4 (cherry picked from commit 02c37f59839b7bb36b231560893fa3bccbecc065) Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Fix regression in QTextDocument::toHtml() with font pixel sizeEskil Abrahamsen Blomfeldt2012-09-131-0/+1
| | | | | | | | | | | | | | Introduced by 2e0003eda4783f69a40fb4b31e7084c761d9640d. We were missing a attributesEmitted=true which caused the output from toHtml() to sometimes be invalid when using pixel sizes to specify the font size. This is a back-port of e640ebacb97f6eea9614925b1da3b97a0ff51409 from Qt 5. Task-number: QTBUG-25778 Change-Id: Ied61fcaef425a590d71c0b52292ac676cb88ba52 Reviewed-by: Jiang Jiang <gzjjgod@gmail.com>
* qpa: improve DirectFB performanceJulien Brianceau2012-09-131-0/+4
| | | | | | | | | | QDirectFbWindowSurface::resize() must call parent QWindowSurface::resize() method in order to update QWindowSurfacePrivate size. Change-Id: Icd605dc1923f2560579ccb2e4f800c80ff7e92fd Reviewed-by: Holger Freyther <holger+qt@freyther.de> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* QNX: Do not initially commit all memory used in RegisterFileThomas McGuire2012-09-132-4/+39
| | | | | | | | | | | | | | This reduces memory consumption of an application quite a bit. This is a backport of 3958828af8ee5cc046c664d8d8e483314eac06cb from qtjsbackend. At the same time, it is a backport of upstream commit http://trac.webkit.org/changeset/111234, although the patch is quite different as upstream and Qt's JSC have diverged a lot. Change-Id: Ia76359ae614ddd4aeda9c7c7b012e5809b50074d Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Fix realpath() call to older POSIX platformsRafael Roquetto2012-09-121-8/+13
| | | | | | | | | | | | | | Some POSIX platforms do not support realpath(X, 0). This commit is akin to the following qt5 commits: 4a4e9e4a9c56f9b27f2fb76fae6ff06b9f470895 ad5d64226abd50a43856ab560583f37b49ff04c9 6e8e1da0a8267d2f8f568403e6ab9fe53b01cd29 f3707a5a0c4483b15e7bb2ba9f0e7d1913a713ee Change-Id: I05dc12cedefcaaa11eec2bcc71df023fdb51ac00 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fixed crash in blackberry platform plugin shutdownBernd Weimer2012-09-121-3/+3
| | | | | | | | Change-Id: I6f83b1223b7bd57b5dfc46fe5bed276269b1a676 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* qpa: extend drawPixmap capabilitiesJulien Brianceau2012-09-124-43/+105
| | | | | | | | | | Extend drawPixmap capabilities for qpa through new OpacityPixmapCapability QBlittable flag and add related implementation in DirectFB platform. cherry-picked from qt5/qtbase 4ae829c1dbd0e8a72b82ab4c6cddb0a4ffe009f6 Change-Id: I8abdb0fa72bc030d769190d7cba40561007e7b46 Reviewed-by: Jørgen Lind <jorgen.lind@gmail.com>
* Ensure that QApplication is cleaned up after itself on MacAndy Shaw2012-09-123-0/+13
| | | | | | | | | | If the sendEvent function is replaced on the NSApplication, then QApplication should ensure that it undoes that if it is destroyed while the NSApplication is still running. Task-number: QTBUG-24248 Change-Id: I087ae575b7d670fa8dacfb80636d813c7bceb41d Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
* Ensure child items are updated even if the parent item has no contentAndy Shaw2012-09-121-1/+2
| | | | | | | | | | | | | When a parent item had its visiblity toggled, then the child item would not update if the parent item had ItemHasNoContents and ItemClipsChildrenToShape set. This is a common use case in declarative as the root item has ItemHasNoContents set. Task-number: QTBUG-26846 Change-Id: Id6592ebc4ba2caa4331a4a71f7247e40993131b6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> (cherry picked from commit 49c251e0543ea80e69d1725bb08bb4dfe3f225ab)
* qpa: add non-opaque fill supportJulien Brianceau2012-09-125-25/+120
| | | | | | | | | | | Add non-opaque fill support for qpa through new QBlittable flag "AlphaFillRectCapability" and add related implementation in DirectFB qpa platform. cherry-picked from qt5/qtbase aab15782e21bf0aaea7f2211278e9aa9fc78c6d7 Change-Id: Ia1c74c2926d2e244290dcb62cbd3b6848ba95707 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Prevent a crash when a merged action is removedAndy Shaw2012-09-111-0/+10
| | | | | | | | | If a merged action is removed then a crash can occur if it is readded later. Task-number: QTBUG-24917 Change-Id: I43dcde3f40950fafc33d976e861a90fe1c38d061 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* QtNetwork: bypass proxy for local connectionsJulien Brianceau2012-09-072-10/+13
| | | | | | | | | | | According to Qt doc, "Network proxy is not used if the address used in connectToHost(), bind() or listen() is equivalent to QHostAddress::LocalHost or QHostAddress::LocalHostIPv6. This is not the case in current implementation. cherry-picked from qt5/qtbase commit 5b1bc864a91c3bdb02e36e7546dadebabb42fdec Change-Id: I20585b4be1149f67f77f02903aac53ee8b140eab Reviewed-by: Richard J. Moore <rich@kde.org>
* Fix calculation of logical child index for row headers.Tilman Sauerbeck2012-09-071-1/+1
| | | | | | Change-Id: I6b7a5b4d698d496a6710dd479b24f10c7d7e5851 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com> Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Symbian: fix symbian QtCore deffile (for QObjectPrivate)Pasi Pentikainen2012-09-071-0/+2
| | | | | | | | | | Freeze added exports caused by commit 3c4c9709 (change If5c3701426208875f3b775040c4e7bcbaac2b0a9), to fix Symbian winscw build break. Change-Id: Ia8c14d95004e17059af05e91431b71b6767d3885 Reviewed-by: Jaakko Helanti <ext-jaakko.helanti@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Symbian: fix symbian QtCore deffiles (for QUrl::detach)Pasi Pentikainen2012-09-072-0/+3
| | | | | | | | | Freeze added exports caused by commit c3fe37fe (change Ie2674e46eb7416b0e753323b673c10f9d3457f6d). Change-Id: Icca8eff81e62f73639ee7f21b087370dfe501571 Reviewed-by: Jaakko Helanti <ext-jaakko.helanti@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Symbian: Handle Qt input hints for email and url editorsJaakko Helanti2012-09-071-8/+4
| | | | | | | | | | | | | | | | | | Earlier Qt input hints ImhEmailCharactersOnly and ImhUrlCharactersOnly were handled in Symbian by function CAknEdwinState::SetSpecialCharacterTableResourceId. Along with the new QML touch input any support for this mechanism has apparently ceased, and the input hint has no effect. To get '/' to the first page of url editor virtual keyboard, or '@' to the first page of email editor virtual keyboard, one has to use function CAknEdwinState::SetExtensionFlags instead. Smileys are disabled when these hints are set. Change-Id: Iec87274da40a7d59c97a479affed7d143dd5aa25 Task-id: ou1cimx1#1012431 Reviewed-by: Marko Kenttälä <ext-marko.r.kenttala@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Revert "Speed up QTextEngine::resolveAdditionalFormats"v4.8.3Eskil Abrahamsen Blomfeldt2012-09-071-65/+2
| | | | | | | | | | | | | | | | This reverts commit 49fbb6e14af78f751fa114c3cf986aaa607d7408 which introduced crashes e.g. in Qt Creator. Since the original change was an optimization, it is reverted in the Qt 4.8 branch since stability is the main priority there. The crash has been fixed for the corresponding Qt 5 commit. It would be an option to recommit the optimization and the crash fix to a future minor release of Qt 4. Task-number: QTBUG-27140 Change-Id: I9dc959ea252fe55a22fd90f333ccb335b3ef1311 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Allow compilation on OS X 10.5Sean Harmer2012-09-051-4/+5
| | | | | | | | | | Fixes regression introduced by aa21fcac3672cc6f0dca064b34bbe02ca4f4def7 Change-Id: Iada496dd8fee390771d8fc12066e93ef086dee90 Reviewed-by: Teemu Katajisto <teemu.katajisto@digia.com> Reviewed-by: Juhani Taipale <juhani.taipale@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Optimize QTextEngine::findItem by using a binary search.Milian Wolff2012-09-051-5/+12
| | | | | | | | | | | | | This is basically a backport from Qt5: - revert the revert: 22995948cd3f46780be5d8016708aeef0cd7b066 - backport from qtbase: 487583459ea7958f24cd579888a662bcce26caf3 this fixes the off-by-one error in the binary search Task-number: QTBUG-17209 Task-number: QTBUG-231 Change-Id: I7f62fb33cf919ecd7fb2246ae01bb23559e11bf4 Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* QWizard/Win: Fix vista helper cache state invalidationJonathan Liu2012-09-051-1/+2
| | | | | | | | | | | If the cached state is not dirty and the instanceCount is zero, when the instanceCount is incremented the cached state will not be correct. To fix this, reset the cached state to dirty if the instanceCount is incremented from zero. Change-Id: Ic49eef7f83b1289a939f998817b1b2b5f5a2a45f (cherry picked from commit e5ebcbc6343a5d5d815cbbd1812f1f5791b7bc88) Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* qpa: incorrect rendering when stretching and clippingJulien Brianceau2012-09-031-5/+17
| | | | | | | | | When using QBlittable with SourceOverScaledPixmapCapability, rendering through clipAndDrawPixmap is incorrect when stretching: source pixmap rectangle has to be corrected using scaling factor. Change-Id: I80ad1c5ddc73a7b7394d0f5b412931c6279c175a Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* QWizard/Win: Fix incorrect cached state after all wizards destroyedJonathan Liu2012-09-032-1/+5
| | | | | | | | | | | | | | | | | | | | | If a QWizard is shown when Aero is enabled, the current visual style is cached in a static member of QVistaHelper. The cached state is updated by QVistaHelper when it receives WM_THEMECHANGED or WM_DWMCOMPOSITIONCHANGED events from Windows. If all QWizard instances are destroyed, there are no instances of QVistaHelper to receive these notifications and update the cache. If Aero is now disabled, the cached current visual style in QVistaHelper isn't updated. If a wizard is now created and shown, a large black rectangle is shown in the titlebar. A static instance count is added so that when no wizards are running, the cached state is not used. Task-number: QTBUG-27004 Change-Id: Iefe4c8552388280219c9726418ed7476b8ebb15a (cherry picked from commit 952ea029f40aaff9de0101fc165907ef8693e4aa) Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix limitting shortcuts to keypad onlyJani Honkonen2012-08-311-2/+7
| | | | | | | | | | | | | | | | | | The Qt::KeypadModifier modifier is internally masked away from all shortcuts. So it is not possible to set a keypad only shortcut. Changed the implementation so that first a full keysequence match is searched. Then if no match is found the same sequence is tried without the keypad modifer. Added a autotest for this also to cover the basic use cases relating to this. This is a backport of qt5 commit: 547a1bea492954d828aa0798be93384669812489 Task-number: QTBUG-20191 Change-Id: Ibb6809050ff6da23bdb1c087b93e517d1963d34c Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Speed up QTextEngine::setBoundaryOlivier Goffart2012-08-311-6/+14
| | | | | | | | | | | | | | | Before, setBoundary was O(N), now it is O(log N) assuming the boundaries are added in order. (splitItem might still be linear because of the call to QVector::insert) This speeds up a lot QTextEngine::addRequiredBoundaries when there is a lot of addFormats. (For example if there is a very long line with syntax highlighting) Task-number: QTBUG-8389 Change-Id: I10c9fca72343f46db24b1d4f519f7747188d4009 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> (cherry picked from commit c13011829fd39661cc9e983256766c6edb88dead)
* Speed up QTextEngine::resolveAdditionalFormatsOlivier Goffart2012-08-311-2/+65
| | | | | | | | | | Don't call the linear QTextEngine::format in the loop. Instead, keep track of the current formats by indexing their start and end position. Task-number: QTBUG-8389 Change-Id: I89c18b804111edfab6254442cbee33da39d1a273 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> (cherry picked from commit 4f6efe16416f0222ae78ab16c0eb8085bf9c521b)
* Make connectNotify() work with QMLThomas McGuire2012-08-3112-34/+254
| | | | | | | | | | | | | Call connectNotify() and disconnectNotify() in QML signal handlers and in QML bindings. This is a backport of Qt5's QtDeclarative commit 26ea8e01e9ee2a8c8c09266147b94c9ac92d09f9. Task-number: QTBUG-11284 Change-Id: If5c3701426208875f3b775040c4e7bcbaac2b0a9 Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Windows: Fix Drag and drop in Designer.Friedemann Kleint2012-08-311-3/+14
| | | | | | | | | | | | | | When hitting on a child widget that does not accept drops, go up the hierarchy until the parent is hit or a widget that accepts drops is found. Introduced by f6bf4b2baa91e55f40596bf3f2823b119fdfa5e0 . Task-number: QTBUG-22987 Task-number: QTBUG-27037 Change-Id: I4d9308942c1109c11f7e31555d4ad84fa2610d15 Reviewed-by: Markku Tapio Heikkilä <markku.heikkila@digia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fixed the QTreeView expansion/collpasing when animatedThierry Bastian2012-08-311-2/+6
| | | | | | | | | | | | | | | | | | If you had a QTreeView with expandable items, if you tried to expand and while the animation was still running you'd try to collpase the node, the display would be completely broken: the items below that items would not be visible any more except for a fraction of a second when expanding or collapsing it again. The problem is in the fact that when starting an animation the QTreeView stores the state before animating. And it does that even if an animation is already running. So the stateBeforeAnimation becomes AnimatingState and when the animation finishes, AnimatingState is the state that is restored breaking the painting. Unit test is included. qtbase-sha1: 1e97dbaf6ca807397e3ec77a3611763769499d17 Change-Id: I62e16101b70153f78022f6195fd9de6db0cd4878 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* documentation: grammar nitpickMark Brand2012-08-311-3/+3
| | | | | | | | | | Cherry-picked from qt5/qtbase 4692432b61b09f010a3a7e57e80b9599686fe438 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Bill King <bill.king@nokia.com> Change-Id: I1944946b5f17bbf69005d2da30cedff4970f9827 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Backport fix screen event-registration failure.James Turner2012-08-311-0/+13
| | | | | | | | | | Don't attempt to register for events from non-attached screens. Backport of commit 9597e0d2a23c4673aea7a74598a6a634527c443c from qt5/qtbase Change-Id: I95859abc476f43308ba9b2c684b8eaae731c59f6 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fixes possible memory leak in QContiguousCacheFabian Bumberger2012-08-301-2/+4
| | | | | | | | | When inserting an item on a position that is already occupied, the destructor of the old item was never invoked. Qt5 SHA1: b4075c8ea31b235cdbb61fcd6290105b9914d627 Change-Id: I842fd81f284d9ca58760bce7e1adfea84da0a788 Reviewed-by: Peter Hartmann <phartmann@rim.com>
generated by cgit v0.12 at 2025-01-28 04:15:36 (GMT)