summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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-312-2/+47
| | | | | | | | | | | | | | | | | | 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>
* rebuild configureOswald Buddenhagen2012-08-311-0/+0
| | | | | | | | | ... again. Change-Id: I0b36c25373bdb3842dd41df598804310e502acb1 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Juhani Taipale <juhani.taipale@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Persian translation of Qt has been updated for 4.8soroush2012-08-311-17/+561
| | | | | | | Change-Id: I30537aed87cc793c74588f0220072e97b7232e46 Reviewed-by: Mahdi Reviewed-by: Abbas Farahmand Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.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>
* Display QThread name for debugging.Sean Harmer2012-08-301-0/+30
| | | | | | | | | | | Backport of commits: fb62fdac1cdb4e26388b5bacc7422ec4579b217e fe7c600fabdfb1b4cbad624ce7cb736e5edce86d 3ef51efbe75bfb9f1dfbe7df073e9eb745a72ad8 47fd7128dba4c38ff1bfcc517fec0f063fb90e4c Change-Id: Ibcb13ebb2e6cb05ab381328228eca5abdde52ad9 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Implementation of the BlackBerry Bearer engineBenoit Dumas2012-08-305-0/+644
| | | | | | | | | | | An implementation for BlackBerry devices based on the BPS netstatus APIs. cherry-picked from qtbase df7a1a28aaab31 Change-Id: I979f594aca64315af1f39e68886b819f7f215f6b Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Vladimir Minenko <vminenko@rim.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Blackberry: Fix QFileSystemEngine::tempPath()Thomas McGuire2012-08-301-2/+5
| | | | | | | | | | | | | Apparently it depends on the user and/or firmware version on whether TMPDIR or TEMP is set, so try both. Additionally, fall back to /tmp if neither is set, as that seems to be present on all devices. This is a backport of a135d87a0f8ec24445e13fb54f4316e4ca7473be from Qt5. Change-Id: I1637f4ab74c8c8bd350b4efb451c2143c0642796 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* tst_qtoolbutton: stabilize and improve failure messageRohan McGovern2012-08-281-2/+7
| | | | | | | | | | | Allow for a little more leeway in timers. Task-number: QTBUG-26004 Change-Id: I59936d0f675b7f734e04b3f5e63631c74ca4f163 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com> Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com> (cherry picked from commit 4eecbf3b842afcfb91d78552ce19d2c0b8f8c53a) Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* QGLGlyphCache: Fix texture buffer overrunJonathan Liu2012-08-271-9/+7
| | | | | | | | | | | | | | The QGLGlyphCache::cacheGlyphs function reallocates a larger texture when there is no more room to insert a newly rendered glyph. However, the glyph width used to check whether reallocation is needed is not the same as the actual glyph image width and may be less. When the glyph image is then copied into the texture, a buffer overrun may occur. Task-number: QTBUG-23584 Change-Id: I71d6cd987b7519e5235109c14a5a35e452332417 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* QSharedPointer: make QT_SHAREDPOINTER_TRACK_POINTERS work with QObjectsGiuseppe D'Angelo2012-08-272-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | If setQObjectShared crashes because a QObject is tracked by two different QSharedPointers, we lose the debug feature offered by #defining QT_SHAREDPOINTER_TRACK_POINTERS, as the check done by this define happens after the setQObjectShared call. Therefore, move setQObjectShared after the internalSafetyCheckAdd2 call. This way, the error raised by QSharedPointer created changes from f.i. QSharedPointer: pointer 0xa10010 already has reference counting to the more "debuggable" (and consistent with non-QObjects) QSharedPointer: internal self-check failed: pointer 0x1dd90e0 was already tracked by another QSharedPointer object 0x1dd9330 "Backport" of change-id I71340d0f878828354537762d01c46d441efc918c from qtbase (although, as of commit 609b0a9c2e69180ceff5d89c42e0d9468491d7e3, this issue is not present there, as setQObjectShared does nothing). Change-Id: I4cea83d705795eae0e05da128a3f189aea36f5ce Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Take account of hidden items in QListView when using scrollTo.Stephen Kelly2012-08-272-3/+38
| | | | | | | | | | This is a backport of 799ceebad8a2dbe1ca0e60a11c7d6ca0c2c8b7a9 from qtbase. Task-number: QTBUG-21804 Change-Id: I757b9598f354cdfa62c08d0c2613ded93fe88804 Reviewed-by: Jani Honkonen <jani.honkonen@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Fix patch to WebKit git repoSimon Hausmann2012-08-251-1/+1
| | | | | Change-Id: Ibb5165f3f4ac4aca23cf28a504b8ef7179b018b1 Reviewed-by: Andras Becsi <andras.becsi@nokia.com>
* test: Re-enabling tst_QPrinter testSergio Ahumada2012-08-251-3/+0
| | | | | | | This test has been passing for some time now. Change-Id: I8d03e3af184645b89b8a2e81be7d4bc5be14816e Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
* test: Remove useless insignificant_test markSergio Ahumada2012-08-251-2/+0
| | | | | | | | This mark does not have any effect as the real mark is under tests/auto/selftests/test/test.pro Change-Id: I8885e6921940d0652326934dd1acc2d0cd3bc7a0 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* test: Re-enabling tst_QToolTip testSergio Ahumada2012-08-251-2/+0
| | | | | | | This test has been passing for some time now. Change-Id: If33c0a4b675f6ab331fa64709c2c8c8f3f3ffb4e Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
* Fix indentation.Morten Sorvig2012-08-247-7/+7
| | | | | Change-Id: I3442592b903afa99e85953cdf40b91b914963a8b Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Parse yearless date strings on leap years during LIST in QFtpPhilip Van Hoof2012-08-231-2/+35
| | | | | | | | | | Adapted _q_parseUnixDir to handle yearless date strings during a leap year while performing LIST. Task-number: QTBUG-26911 Change-Id: I3193400a274a896530d45de986ec8fa5b159abb4 Reviewed-by: Shane Kearns <shane.kearns@accenture.com> Reviewed-by: Philip Van Hoof <philip@codeminded.be>
* QUrl: fix thread safety.David Faure2012-08-233-49/+264
| | | | | | | | | | | | | | | Developers expect const methods on the same QUrl instance to be usable from multiple threads (including copying and modifying the copy). The delayed parsing and internal cache of encoded strings break this, however (and the implicit sharing, for the case of copying). Protection with a mutex fixes this. Qt-5.0 doesn't have this issue, since QUrl doesn't do delayed parsing anymore. Change-Id: Ie2674e46eb7416b0e753323b673c10f9d3457f6d Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix a QListViewItem width when spacing is setJani Honkonen2012-08-232-5/+77
| | | | | | | | | | | | | | | | The listitem width was calculated incorrectly because spacing was not considered. This fixes the second part of the reported bug where spacing is set. Added some tests to catch the issue relating to the reported bug. Also added a test to check spacing in general. Backported from Qt5 commit: d2bba5e5535726f277e8dc67b1478168f57b24bd Task-number: QTBUG-21804 Change-Id: I20cae3a2b9d42650052441f9f15b43f72418f58b Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Remove warning about non existing paint device engineTitta Heikkala2012-08-231-25/+27
| | | | | | | | | | | | | | | The QWindowsVistaStyle::drawPrimitive() method was trying to draw the pixmap for an item in an item view even if the section width was zero or less then zero. This resulted "QPainter::begin: Paint device returned engine == 0, type: 2" error. It's now checked that the width and the height of the section is greater than zero before creating the painter. Task-number: QTBUG-26047 Change-Id: I36dd2792fd505be773951e5ac36b0e3362ec2292 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> (cherry picked from commit 929e934969c621d7c1773e4233c14d358de4d385)
* Make QStatusBar text available via accessibility.Tilman Sauerbeck2012-08-233-1/+16
| | | | | Change-Id: Iec3efb4b91bdba33fe93b928ff2349440e15aa35 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* QNX: Enable QT_NO_IMPORT_QT47_QMLKevin Ottens2012-08-231-0/+2
| | | | | | | | Add this include to reduce the startup time of QML based applications. Supporting the "Qt 4.7" module name isn't needed for QNX. Change-Id: I86db40eefa83ccdd53a036faf0df4fd2135b2b74 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* test: Mark tst_qdeclarativeflickable unstable failures as XFAILSergio Ahumada2012-08-231-2/+14
| | | | | | | | The test has two unstable failures, so mark these with QEXPECT_FAIL Task-number: QTBUG-26905 Change-Id: I1912626376f70ae6d645638fb5b07dbf9e4c3393 Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
* uikit: update screen geometry correctly for interface orientationEike Ziller2012-08-231-7/+6
| | | | | | | Broke with baeb42184402454da3e337bbfa2f4d5c7346435f Change-Id: Ia8d844b7b4b9815a1cce4a1acccdbe515149d3ea Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* uikit: Fix missing point to pixel conversionsEike Ziller2012-08-231-6/+6
| | | | | | | Qt wants drag distance and font size in pixels. Change-Id: I363ed9ab8bcfdcddbfd168fc81b71c4184ecfa5c Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* uikit: Adapt readme and examples to recent changesEike Ziller2012-08-233-24/+17
| | | | | | | | | Use the new configure option (4720003c8f52ad7ecb59be04e1b5aa319c2f0ff0) Add info about mkspecs (c13df9f2147e85e104ac105f975ef87914c908e9) Change-Id: I4eadd4807a36400de3cf261605e3e1a71d217bbc Reviewed-by: Ian Dean <ian@mediator-software.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* test: Mark tst_QWidget unstable failures as XFAILSergio Ahumada2012-08-231-5/+26
| | | | | | | | | XFAIL'ing lots of failures on Linux and Mac. Also removing some unused variables. Task-number: QTBUG-26896 Change-Id: I1deb1ad0141e48d3df7cf0a2a4ea84c593f4a0fc Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Doc: Really minor typo fixSergio Ahumada2012-08-231-1/+1
| | | | | | | Task-number: QTBUG-26891 Change-Id: I9b726d8766337fbb001afcb9ecbc45f51b6e363f Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com> (cherry picked from commit 75901712f04eceafd164cbbf752c916070b44507)
* Fix undo and redo in QLineEdit when in password modeJani Honkonen2012-08-223-2/+90
| | | | | | | | | | | | | There are some security issues with undo/redo. User should not be able to get the erased password back in any situation. Therefore redo must be disabled completely and undo is limited only for erasing previously entered text. Backported from Qt5 SHA1: 121062d8848986dcfaf421388a5603b3b48a1e58 Task-number: QTBUG-14226 Change-Id: Ia712f95e8a2e45537a95d48b70686a1a8dd95da2 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Fix QListWidget scrolling with keys when there are hidden itemsJani Honkonen2012-08-222-3/+63
| | | | | | | | | | | | | If the selected item is scrolled with keyboard keys the selected item will go outside the visible area. The scrolling did not take hidden items into account when calculating the amout to be scrolled. Backported from Qt5 commit: d4385e48b8566a5587048a3c6d8b2396ba587ed5 Task-number: QTBUG-21804 Change-Id: I81a82ed56bb0e4c0229fd117784790e1234aacca Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Remove qurl.cpp from qmake and bootstrap, it's not needed.David Faure2012-08-217-18/+19
| | | | | | | | (and I need this out to be able to use QMutex in QUrl) Change-Id: Ic3eec2b41bd8626ce99f31c83a167c1c197dad82 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* test: XFAIL tst_QListWidget::fastScroll() test on WindowsSergio Ahumada2012-08-211-0/+5
| | | | | | | | | The test has one unstable failure so mark it with QEXPECT_FAIL until is fixed. Task-number: QTBUG-26892 Change-Id: If7e647380a99db3145522c780980fe4904c76114 Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
* test: Re-enabling tst_QFileInfo test on WindowsSergio Ahumada2012-08-211-2/+0
| | | | | | | This test was fixed by b1c46b4b3e322554146aed92cd6035cd9ba43982 Change-Id: I423ea7cb2587c23cc5afe2eac28bed8ba80d67a2 Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
* Fix deleting of QTreeWidget items.Friedemann Kleint2012-08-201-0/+1
| | | | | | | | | | | | Breakage introduced by af617c319772a34115d0c4d802f25a807cb43065, which caused the autoconnections to no longer work. Task-number: QTBUG-26770 Change-Id: Id00341d93d4a830f3f48a1db6234818e6d262977 Reviewed-by: Kai Koehne <kai.koehne@nokia.com> (cherry picked from commit c6616bcdc87b8665a2ea84b07dd04229f2ccbd7a)
* Register less types for QtDeclarative/QCoreApplicationKevin Ottens2012-08-203-68/+78
| | | | | | | | | | | | | | | | | | In Qt5 QtQml and QtQuick are separated so you have control on the amount of facilities you need. It is not the case in Qt4 unfortunately so you always pay the price of those registration. To overcome that, this patch avoids quite some of the type registration when we detect we're not running a QApplication. In such case all the GUI related QtQuick 1 runtime is not usable anyway. We keep around only a handful of convenience like Timer, Connection, Component, etc. Change-Id: Idf5aa935795a224ceb5bc66015282fd094b5686c Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* test: Re-enabling tst_QListWidget testSergio Ahumada2012-08-171-2/+0
| | | | | | | This test has been passing for some time now. Change-Id: I2ac0eaacab5e9873b691d3d1f5dad3d85ec90485 Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
* test: Re-enabling tst_QImageReader testSergio Ahumada2012-08-171-2/+0
| | | | | | | This test has been passing in a stable way since build 679. Change-Id: I19dd774793b11604ac0c725cc23adc58fd63cba7 Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
* Fix tst_qbytearray on QNX/Blackberry systemsRafael Roquetto2012-08-172-4/+2
| | | | | | | | | tst_QByteArray::qUncompress() no longer fails on QNX systems. cherry-picked from qt commit 555e4e05f4f98f524e108fba0fb236406f2e2b2f Change-Id: Ia88204b42f65a94c3f00c4b618255e1870c5a564 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Disable 3DNOW on Blackberry/Win32Rafael Roquetto2012-08-171-0/+1
| | | | | | | | | | | 3DNow is being incorrectly auto-detected on Windows, causing it to be enabled by default when cross-compiling to Blackberry. In other words, the code line introduced by this patch should have already been there since the beginning, but it got lost somehow. So here it is. Change-Id: Iad0b90908602633e3046b54c1c60139c6483632d Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Implement QAccessibleLineEdit::characterRect()Jan-Arve Saether2012-08-163-3/+27
| | | | | | | | | It was probably not implemented because it needed to access private APIs. However, accessing those from this a11y plugin is unproblematic. Change-Id: Icadad45a83daa60e2fbc4cab17b91c84c3f36a7f Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* Polish Polish translationsJarek Kobus2012-08-162-158/+85
| | | | | Change-Id: I52ae2101dd60881ffb9e5202b8351d8bd192e42a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* test: Re-enabling tst_qdeclarativeerror testSergio Ahumada2012-08-161-1/+0
| | | | | | | This test is passing now on Windows. Change-Id: I569c32c268406e3909ad418dc1761f85e9388f92 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix error test on Windows.Glenn Watson2012-08-162-1/+2
| | | | | | | | | Add missing .gitattributes file to ensure the test data file is checked out with LF line endings on Windows. Change-Id: I9ece655dbc8657d6e70c58ce1ada06ee021c92ad Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com> (cherry picked from commit 587b21cf18bcb689aef58411837ed616b02c952b)
* Fix for restoring dockwidget's size when it gets dragged.Mikko Knuutila2012-08-162-6/+51
| | | | | | | | | When user drags a dockwidget out of the docking area, restore widget's previous floating size and center it's titlebar under the mouse. Task-number: QTBUG-2940 Change-Id: I004de36d649abc4c32420bdd46bb6c810ef98c64 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* rebuild configureOswald Buddenhagen2012-08-151-0/+0
| | | | | | Change-Id: I4dbe8cb9b777b141e9e147277c7a424739d40926 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Prepare QtHelp library for modularized documentation.Pierre Rossi2012-08-1511-31/+65
| | | | | | | | | | | | | | - Support ".." in QCH documentation file paths. This essentially means that we stop using cleanPath, and where needed, prepend the virtual folder name, followed by "/..", in front of the original path. - Remove com.trolltech default DocPath since this was not used anymore. (Cherry picked from Qt5: I7309805000f343e2f58c74cd0655a936399fd939) Change-Id: I6508529de756bad979356c63bfcf6c55a609e827 Done-with: Casper van Donderen <casper.vandonderen@nokia.com> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* XMLHttpRequest does not support the DELETE methodJani Honkonen2012-08-155-4/+33
| | | | | | | | | | This is a backport from qt5 commit: 0eeb925aa5039ffddf8d623f250980fc4c97712e Task-number: QTBUG-17963 Change-Id: Ibc262e81d6c7d3b6882461627a7a312d1fbafb3b Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
generated by cgit v0.12 at 2025-01-01 04:06:30 (GMT)