summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* Doc: Fixes to Qt Quick documentation.Jason McDonald2010-09-022-4/+4
| | | | | | | | | | | Reviewed-by: Trust Me To-be-verified-by: Qt Doc Team (cherry picked from commit f33359fb0c56fe88e0ae3c564b7847f90889eac2) Conflicts: doc/src/declarative/declarativeui.qdoc doc/src/external-resources.qdoc
* Fix crash when all the items in a QListView are hiddenJason McDonald2010-09-021-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | Calling QIconModeViewBase::initDynamicLayout() on the second and successive segments would return QPoint(-1,-1), resulting in a totally empty area rectangle for all the items while in QIconModeViewBase::doDynamicLayout(). This rectangle is used to initialize the BSP tree, and produces an arithmetic exception when empty. Furthermore, a rendering bug was also apparent when displaying the first item of a segment while the last item of the previous segment was hidden. Auto-tests included. Reviewed-by: Olivier Task-number: QTBUG-12308 (cherry picked from commit 3c7e7992461b1fef37ada68244f1b5b891015bda) Conflicts: src/gui/itemviews/qlistview.cpp tests/auto/qlistview/tst_qlistview.cpp
* Workaround for QTBUG-8013: Do not return an ascent of 0Alessandro Portale2010-09-011-1/+4
| | | | | | | | | | | | | | | | Symbian's CFont::FontMaxAscent() returns in some cases an incorrect value of 0. That usually happens (for some font sizes) if a stroke based font is the main system font. We were able to reproduce it on some S60 3.2 devices with a chinese language pack installed. This patch will test if CFont::FontMaxAscent() returns 0. And if so, it alculates an ascent taht makes more sense. Task-number: QTBUG-8013 Reviewed-by: Liang Qi (cherry picked from commit f4f10d2a2d60790939492694abf6b9578a5f048a)
* Document that animations have to be started/stopped as a groupBea Lam2010-09-011-0/+8
| | | | (cherry picked from commit 6c7ed006b0a1f006e11fd5f78dd996d65114fc98)
* Increase drag distance on Symbian to improve finger usability on capacitive ↵Joona Petrell2010-09-011-1/+1
| | | | | | | | screens Task-number: QTBUG-12594 Reviewed-by: Martin Jones (cherry picked from commit 89e723153b15af5d3acbeb859d4f35bf52f8e250)
* Phonon; Use correct Phonon version numbers.Justin McPherson2010-09-012-4/+4
| | | | | | Task-number: QTBUG-12627 Reviewed-by: Andrew den Exter (cherry picked from commit 5569070c39a5778cb9e2ff1bab32993217e788c5)
* PathView required some diagonal movement before a drag was initiated.Martin Jones2010-09-011-1/+1
| | | | | | | | Any movement beyond the threshold is sufficient. Task-number: 12747 Reviewed-by: Joona Petrell (cherry picked from commit 44d5bcde1713a5f51b7140259e9fd4e426a868a8)
* XmlListModel doc fixesBea Lam2010-09-011-1/+7
| | | | | Task-number: QTBUG-12749 (cherry picked from commit 0d060e71a5a03f21df5b2edbb4f6de1e928b9ada)
* Crash in QX11PaintEngine::drawPixmapCarlos Manuel Duclos Vergara2010-09-011-0/+2
| | | | | | | | | | | We receive a pixmap as a const reference and then we convert it to an X11 pixmap. This conversion could fail for many reasons, however we were not looking at the result of this conversion. This patch was contributed by Christoph Feck from KDE. Task-number: QTBUG-12826 Reviewed-by: Samuel (cherry picked from commit 8e7fb343372acd0bc5fe04db7a5c5542541d4538)
* Fix broken example codeBea Lam2010-09-011-5/+8
| | | | | Task-number: QTBUG-12839 (cherry picked from commit 59d36ea601aef6182cba0e0f5fc56cc102e29c59)
* Cocoa: Demo browser can get stuck after closing modal dialogRichard Moe Gustavsen2010-09-011-0/+6
| | | | | | | | | | | | | | | This turns out to be a glitch in the event dispatcher for Qt/Cocoa. The problem is that you can, in some really slim cases it must be, end up calling processEvents with the exec flag set, while the current modal dialog has been told to leave modal. In that case, we recurse into a new event dispatching loop for a session that is about to die. And that causes problems when the session actually dies. This patch makes sure that you cannon start spinning a session that is about to die, by setting the sessionCache to zero. Task-number: QTBUG-13164 Reviewed-by: Tor Arne (cherry picked from commit a373648fa876a9684394aa9b7ecafd51e53f4742)
* Doc: Fixed qdoc warnings.v4.7.0-rc1Jesper Thomschutz2010-08-249-30/+80
| | | | | | | | | | | | | | Reviewed-by: Trust Me (cherry picked from commit cb086eb5340c4c41efaf45373aa05c37e8aa974a) Conflicts: doc/src/index.qdoc src/dbus/qdbusconnection.cpp src/declarative/util/qdeclarativeanimation.cpp src/gui/s60framework/qs60mainapplication.cpp src/gui/s60framework/qs60mainappui.cpp src/network/access/qnetworkrequest.cpp
* Cocoa: revert parts of cc6dc0aeefde881a95f5fea2b26f2f3d7bdc6e15Richard Moe Gustavsen2010-08-191-4/+0
| | | | | | | | The reason is that we tried to fix the stacking order of child windows while we fixed a crash. But the patch turned out to break an auto-test Reviewed-by: prasanth (cherry picked from commit 749ad26d255327c9fa3fe857a30983cc6dfef0d9)
* Revert "Fix the rendering of lines with the X11 paint engine"Samuel Rødal2010-08-191-10/+12
| | | | | | | | | | | | | | | | | This reverts commit ebbab30af417dfbf3df47dec15c0e2f8d6a30fa6, which broke fill / outline consistency, and when trying to fix that by rounding the fill the same way that broke rendering in Creator. Unfortunately the X11 paint engine is too sensitive to changes, there have already been tons of patches to make it as consistent as possible. It's simply not possible to get the same rounding for both fill and outlines and at the same time have consistency between fill and outline (no holes or fill outside the outline), while using the integer based Xlib rendering API. Hopefully in 4.8 we'll switch to raster and the X11 paint engine will be a legacy. Reviewed-by: Trond (cherry picked from commit 041a68007413a20a9a9c97d0f2f04f9e03428f67)
* Revert "Outline / fill inconsistency in X11 paint engine."Samuel Rødal2010-08-191-4/+4
| | | | | | | This reverts commit ff405f5623d7ed18c881c097368e3e9afd2e9443. Reviewed-by: Trond (cherry picked from commit 3014b427aa8700890f9bd8ea2a0300fc152bf3d2)
* Outline / fill inconsistency in X11 paint engine.Samuel Rødal2010-08-191-4/+4
| | | | | | | | | | | Change ebbab30af417dfbf3df47dec15c0e2f8d6a30fa6 broke outline / fill consistency in the X11 engine. Since the positioning of lines is more important we'll round the fill coordinates the same way. The bug was visible in the filltest.qps arthur test. Reviewed-by: Gunnar Sletta (cherry picked from commit ff405f5623d7ed18c881c097368e3e9afd2e9443)
* Prevented Xorg crash in qtdemo when running corkboards example.Samuel Rødal2010-08-192-5/+28
| | | | | | | | | | | The crash happens in the Nvidia driver in glXReleaseTexImageEXT when scrolling the corkboard using the mouse. To work around it we detect the Nvidia driver versions where this is known to be a problem and skip using the texture from pixmap extension in those cases. Task-number: QTBUG-12914 Reviewed-by: Trond (cherry picked from commit a76b8bf67696ae69888cc6237417e7c8f07f8da6)
* Cocoa: parent windows shows on screen when they should be hiddenRichard Moe Gustavsen2010-08-191-6/+16
| | | | | | | | | | | | | | | The reason is the cocoa method that adds a window as a child of another, it ends up showing both the parent and the child window regardless. And this could in some cases also cause a crash. So we therefore need to be careful when calling that function, and be sure that the parent is actually visible. In addition, addChildWindow reset the stacking level of the child window, and made e.g. normal child windows pop in front of tool child windows. This could easily be seen in e.g. Designer. Task-number: QTBUG-12866 Reviewed-by: prasanth (cherry picked from commit cc6dc0aeefde881a95f5fea2b26f2f3d7bdc6e15)
* Make this constructor explicit in Qt too.Aaron McCarthy2010-08-181-4/+0
| | | | (cherry picked from commit 167b63d2250e7923d7b660076a80e82af07d9cdb)
* Compile on SymbianMartin Jones2010-08-182-14/+10
| | | | | Task-number: QTBUG-12771 (cherry picked from commit e8d3e8e0b93271bb41fcdc264fc10ec59be5aa20)
* Don't destroy ListModel child list nodes.Martin Jones2010-08-182-11/+28
| | | | | | | | These are owned by the root and must not be destroyed by child lists. Task-number: QTBUG-12771 Reviewed-by: Bea Lam (cherry picked from commit 4026b2c7bc91f8f25f73b182687d5d2bed823217)
* Only modify pixmap cache reply when protected by a mutexAaron Kennedy2010-08-181-1/+1
| | | | | QTBUG-12729 (cherry picked from commit ee7c3b576ced47d3b68da1913cdf6995144bddd2)
* Drawer widget in a MainWindow disappears after returning from full screen mode.Carlos Manuel Duclos Vergara2010-08-181-1/+3
| | | | | | | | | | The problem was in the toggleDrawer function. We were not checking the status of the last transition before setting the new transition, so all the transition were treated as non-intentional. Task-number: QTBUG-11373 Reviewed-by: Prasanth (cherry picked from commit 725d8e061ededee9a5ddf0914aabd0f6aa2ee741)
* Modification of def files for non existing functions.Toby Tomkins2010-08-182-2/+2
| | | | | Task-number: QT-2027 Reviewed-by: Joona Petrell
* Update QtGui def filesJoona Petrell2010-08-182-1/+4
| | | | | | Task-number: Reviewed-by: Martin Jones (cherry picked from commit 875d5e374dce3dd7d7cce87b55e277e8e9497044)
* Update QtDeclarative def filesJoona Petrell2010-08-182-0/+2
| | | | | | Task-number: Reviewed-by: Martin Jones (cherry picked from commit cf0f53ecefd6914d533ffea057748480e3e5bd33)
* Fix QProcessManager destructionMiikka Heikkinen2010-08-171-19/+28
| | | | | | | | | | | | | | | If QProcessManager destructor is ran as part of global static cleanup, manager thread will most likely be terminated by kernel at that point, so trying to delete QProcessActives and QProcessMediators will panic as they will still be active. They can also no longer be properly canceled as the thread is already gone. In case manager thread has already died, which implies that process exit is imminent, we simply do nothing and let the deletion of the main heap at process exit take care of stray objects. Task-number: QTBUG-11218 Reviewed-by: Janne Koskinen (cherry picked from commit 7cfc9f2245162944f3d9a29ad73cd93e2bcf197f)
* Cocoa: Stacking order of modal dialogs is wrongRichard Moe Gustavsen2010-08-161-6/+6
| | | | | | | | | | | | | Modal dialogs were sometimes hidden behind other normal windows on screen. The reason was that, upon going modal for a window, we actually resat the stacking level on the window in a faulty attempt to respect any stays-on-top window flags. This patch makes sure we avoid doing that, and at the same time, ensures we don't reintroduce the original bug as well. Task-number: QTBUG-12841 Reviewed-by: cduclos (cherry picked from commit 6d0d767e63df3c997d6d7a8cb6cd4bf8c0dfc835)
* Multiple "Edit/Special Characters" menu entries on Mac OS X (Cocoa)Prasanth Ullattil2010-08-164-0/+19
| | | | | | | | | | | | Every time [NSApp setMainMenu:] is called, Cocoa will add the 'Special Characters' item to the 'Edit' menu. Before adding a new entry it will make sure that menu items list doesn't contain an item with the selector 'orderFrontCharacterPalette' & a 'nil' target. We need to return the index for the first entry (we have QCocoaMenuLoader as target). Task-number: QTBUG-12842 Reviewed-by: Denis (cherry picked from commit b52da4ab2179079a6aff95891786d2f6598048b5)
* Properly emit geometryChanged() when the position change.Alexis Menard2010-08-131-1/+2
| | | | | | | | Also emit the signal at the very end, so people can rely on the resize event to adjust some stuff in their item. Reviewed-by:yoann (cherry picked from commit 3ee89bc0830f69d44f272eff5a0c886bff33c92e)
* QAudioOutput(ALSA); Fix check for available devices.Justin McPherson2010-08-131-14/+17
| | | | | | | | ALSA can return a list of one empty item when no devices are available. Task-number: QTBUG-12690 Reviewed-by: Andrew den Exter (cherry picked from commit baf8eabd2c647d6ba2bf0a9dc5103f4726808c3d)
* doc: The QML Qt element was missing from the documentation.Martin Smith2010-08-121-3/+4
| | | | | Either someone removed the QML: prefix, or it was never there. (cherry picked from commit a4d19eef86b07d670b8b2a3f9ad6b3448800bae5)
* Disable minRightBearing optimization in QTextLayout on MacEskil Abrahamsen Blomfeldt2010-08-121-0/+2
| | | | | | | | | | | | Neither of the Mac font engines have implemented minimum right bearing, which will cause them to return 0 for the minimum value. This will cause the right bearing to never be calculated prior to breaking and thus never be a part of the breaking width. Since actually implementing the functions is too time consuming for right now, we will disable the optimization for the time being. Reviewed-by: Olivier (cherry picked from commit bb696453f6f87cad58982af3455335478fedb8cc)
* Fix scrollbar randomly popping up in QPlainTextEditEskil Abrahamsen Blomfeldt2010-08-121-4/+17
| | | | | | | | | | | | | | When a line break was detected, we would retain the value of the right bearing for the character after the break instead of resetting it to the right bearing of the previous value. This could in some cases cause the bounding rect of the text to be wrong, and could cause unnecessary horizontal scrollbars to pop up. It was especially visible when using WrapAnywhere. Visible e.g. in the compile output in Creator. Done-by: mae Reviewed-by: Eskil Reviewed-by: Lars (cherry picked from commit c5fa9eb1cb02d979502e2c9918d752c6708fb406)
* Fix QTextEngine overflow caused by extremely long textJiang Jiang2010-08-123-33/+87
| | | | | | | | | | | | | Internally, QTextEngine use int to calculate most of the layout data required. If a string longer than 2^24 is passed into either QTextEngine or classes using it (QStackTextEngine, QPainter, QFontMetrics, etc.), overflow will happen because the memory size required to allocate for layout will become too large for int to handle. This patch will prevent these cases and add error handling mechanism for relevant code. Task-number: QT-3658 Reviewed-by: Eskil Abrahamsen Blomfeldt (cherry picked from commit 05bb249c2ad3ee15eb205a806f8546c105683096)
* Fix RightBearing confusion in text layoutmae2010-08-121-1/+1
| | | | | | | | Negative RightBearing was wrongly taken into account when calculating the line wrap Reviewed-by: Eskil Abrahamsen Blomfeldt (cherry picked from commit 975b1913e44128a3e9b9055f9bf2ff40d86adf2a)
* Updated WebKit to 72b1c38579ca1fdb3f242e29cd16e5bfb4925813Simon Hausmann2010-08-124-3/+16
| | | | | | | Integrated changes: || <https://webkit.org/b/43782> || [Qt] NPAPI plugins not drawn until page scrolled || (cherry picked from commit 87b7587f25928272900900a106f360a4fbb4d6cd)
* Fix regression with SSL connections failing on symbianShane Kearns2010-08-111-1/+1
| | | | | | | | | Due to a wrong ifdef sequence, the unix code was being compiled instead of the symbian code for retrieving the system certificates. Task-number: QTBUG-12718 Reviewed-by: Peter Hartmann (cherry picked from commit 8229eded4cba85ae53c1b03ce87981ebabd2f3ae)
* QSslSocket: fix security vulnerability with wildcard IP addressesPeter Hartmann2010-08-111-0/+5
| | | | | | | | | | This fixes Westpoint Security issue with Advisory ID#: wp-10-0001. Before, we would allow wildcards in IP addresses like *.2.3.4 ; now, IP addresses must match excatly. Patch-by: Richard J. Moore <rich@kde.org> Task-number: QT-3704 (cherry picked from commit 846f1b44eea4bb34d080d055badb40a4a13d369e)
* Don't double-add item change listeners.Michael Brasser2010-08-111-2/+2
| | | | | | | | | When a Repeater was used as the child of an Item binding to childrenRect, the item change listener was being added twice for the items created by the Repeater. Task-number: QTBUG-12722 (cherry picked from commit 6feb5b75ce96aeeefee189af003949db8c031519)
* doc: Fixed some qdoc errors.Martin Smith2010-08-091-2/+3
| | | | (cherry picked from commit fc4e9d15d4b85ade770cf92c10258a556fafa698)
* doc: Fixed some qdoc errors.Martin Smith2010-08-092-0/+33
| | | | (cherry picked from commit 30d6f7ed29a2a5723387768cfe82a807a2724b8b)
* doc: Fixed some S60 qdoc errors.Martin Smith2010-08-092-0/+54
| | | | (cherry picked from commit fb6aa3b0769c33685ad38a13fe5ad0ca48679a93)
* Translation work for 4.7Pierre Rossi2010-08-091-1/+1
| | | | | | | | | validating and adding some french translations. Plus all the fixes from Gabriel's extensive review. Doc: Fix a typo Reviewed-by: gabi (cherry picked from commit 209c017333fea9827fd20c7f8d23721bd8a6ee43)
* Fix broken example codeBea Lam2010-08-081-8/+11
| | | | | Task-number: QTBUG-12705 (cherry picked from commit 59e3430662cfdc3820115a2ff4c0b44829b3d1d4)
* Top-level QML item should not have special focus handling.Michael Brasser2010-08-081-7/+4
| | | | | | | | | It's the scene itself that acts as a focus scope, not the top-level item. Task-number: QTBUG-12682 Reviewed-by: Aaron Kennedy (cherry picked from commit 94b1c07c31ab84d30b198cb23291a48f98164827)
* Improve docs on QML Animation page and associated elementsBea Lam2010-08-087-26/+67
| | | | | Task-number: QTBUG-12666 (cherry picked from commit a9aaaf30b6c542b5c9e3c1e1681088ab26a530c0)
* Fix warning from whining complier.Martin Jones2010-08-081-1/+1
| | | | | | Task-number: QTBUG-12473 Reviewed-by: Aaron Kennedy (cherry picked from commit 1ca575eaf7c166f823b82132110ea066be819540)
* Modified descriptions of QBasicTimer class and isActive() function.Jerome Pasion2010-08-081-3/+4
| | | | | | Reviewed by: David Boddie Task: QTBUG-12313 (cherry picked from commit ab3ce23e3b5e28389b9f6f9bd5bc69cd42fcae5d)
* Update def files for d524da81ee257a6bd67d32d0bc870280a7d5b8a4.Aaron McCarthy2010-08-061-1/+1
| | | | (cherry picked from commit bbd444559359df3e211fedb28d40b175af778030)