summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Fix dealing with the default dynamic properties of string type.Jarek Kobus2011-06-091-7/+15
| | | | | | | | | Fixed showing, changing and resetting of default dynamic properties of string and keysequence type. Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Task-number: QTBUG-9603 (cherry picked from commit 2ff6df50fac75af2d1b9d49101d9b1d8af28535d)
* Safeguard ourselves against corrupt registry values for cleartype gammaGunnar Sletta2011-06-091-0/+5
| | | | | | Reviewed-by: Eskil Task: http://bugreports.qt.nokia.com/browse/QTBUG-7596 (cherry picked from commit aab30e9a3ec78c3a9b2998feeef275e973ef0ff2)
* Force the repaint during a window resize.Fabien Freling2011-06-091-2/+3
| | | | | | Reviewed-by: Morten Sorvig Task-number: QTBUG-6384 (cherry picked from commit 3aee7881eaa45d4cbc1d0a353772cbf44638dadc)
* Fixed the action geometry of menu bar in RTLThierry Bastian2011-06-091-6/+5
| | | | | | | | | It could happen (with MDI widgets) that the first actions would not be visible. Task-number: QTBUG-9560 Reviewed-by: gabi (cherry picked from commit 864ace14e12cedd8e8f78841249e5309eb0a0795)
* Moved item wouldn't follow mouse cursor when ItemIgnoresTransformations is setGabriel de Dietrich2011-06-091-1/+2
| | | | | | | | | | | | Since the introduction of transform properties in QGraphicsItem, QGraphicsItem::transform() is no longer enough to get the correct transform of an item. No auto-test as it involves mouse dragging. Reviewed-by: Yoann Task-number: QTBUG-9295 (cherry picked from commit 253b87180e0a6c5db0feaaed7e321139c4ff1643)
* Total makeover of SVG image readeraavit2011-06-099-69/+667
| | | | | | | | | | | Improved/fixed canRead(). Added svgz support. Implemented ClipRect, ScaledClipRect and BackgroundColor support. Avoid data copy when reading from memory. Improved support reading from sequential devices. Added svg and svgz files to the qimagereader autotests. Task-number: QTBUG-8227 and QTBUG-9053 Reviewed-by: Kim (cherry picked from commit 2fe059c863377befdcf65084a07a7f4841beef0d)
* Fix the bug where the ampersand symbol would be discarded.Fabien Freling2011-06-092-3/+7
| | | | | | | | | We are now checking that the QAction is not related to the About or Quit button on Mac OS X Task-number: QTBUG-7540 Reviewed-by: Morten Sorvig (cherry picked from commit c19cb39ddbfd93802bfe61ecaa4f737a1bd1c1bb)
* Fix wrong arguments order in a warning in QObject::moveToThreadOlivier Goffart2011-06-091-1/+1
| | | | | Task-number: QTBUG-8478 (cherry picked from commit b7f48eee301e973fcfae08dfd8997538b6dbe251)
* _close(fd) closes the associated handle and not the other way aroundJoão Abecasis2011-06-094-2/+69
| | | | | | | | | | | ... according to the online MSDN documentation. Hid the cachedFd member in private data under WinCE, since it's never used there. Task-number: QTBUG-9085 Reviewed-by: Zeno Albisser (cherry picked from commit 7986ab58b9a5d0828291c857d3ce86bfa1af4e6e)
* QFSFileEngine: don't look through NTFS junctionsRitt Konstantin2011-06-091-8/+2
| | | | | | | | | | | | | | | | Starting in 1216161584b730576c24fb128131838be1826b37, we started processing NTFS junctions as symbolic link. This reverts isSymlink() behavior back to former behavior and processes only symbolic junctions. The code path there worked just fine for directory symbolic links but lead to multiple issues for volume mount point junctions due to incompleteness. Task-number: QTBUG-7036, QTBUG-7384 Merge-request: 493 Reviewed-by: João Abecasis <joao@trolltech.com> (cherry picked from commit b4996ab8e3a26d45ee55593da281e4b798c04dd2)
* After showing modal windows, WM_LBUTTONUP for double click is ignored.Prasanth Ullattil2011-06-091-0/+4
| | | | | | | | | We should not ignore WM_xBUTTONUP messages after WM_xBUTTONDBLCLK. Treat these messages like WM_xBUTTONDOWN messages. Task-number: QTBUG-7172 Reviewed-by: Thierry (cherry picked from commit 3fbedcd085b3e89e3646bf49264001ee216c5852)
* build fix for mingwThierry Bastian2011-06-091-1/+0
| | | | | | | we need to define WIN32_LEAN_AND_MEAN to include both windows.h and winsock2.h (http://msdn.microsoft.com/en-us/library/ms737629(VS.85).aspx) (cherry picked from commit 5d65e3c264332262fb09b8fe6f08d284c088a61d)
* Fix QGraphicsEffect cache when the item is not visible by the view.Alexis Menard2011-06-093-3/+3
| | | | | | | | | We can't rely on the exposed rect since the item can be outside the view so we need to regenerate the complete pixmap. Task-number:QTBUG-8750 Reviewed-by:sroedal (cherry picked from commit fcb738161efc965e91c3d528c31ac77d3a05ac64)
* Do not create native window handle just because a parent has one.Denis Dzyubenko2011-06-091-1/+1
| | | | | | | | | | On X11 when creating a widget that has a parent, there is no reason to create a native window handle right away since we don't know yet if the window is going to be ever shown. Task-number: QTBUG-9215 Reviewed-by: Bradley T. Hughes (cherry picked from commit 1d506981bcc3d2b8aad67989fd7946a0ad826856)
* Removed an assert in the print dialog on windowsThierry Bastian2011-06-091-1/+1
| | | | | | | | | | This assert was checking that the parent widget for the print dialog was already created. That's useless since we immediately after call winId(). Task-number: QTBUG-8684 Reviewed-by: gabi (cherry picked from commit 6d6df0e2b63f0103ec1f19b4b856b106e295d618)
* Do not deliver the same key event multiple times in Cocoa.Denis Dzyubenko2011-06-093-28/+19
| | | | | | | | | | | | When QCocoaView receives a keyDown or keyUp event, we translate it to QKeyEvent and deliver it to qt widgets, propagating if necessary. However if none of Qt widgets accepted the event we should propagate it back to cocoa - to get a beep from it, or for example if Qt widget is embedded into a native widget. Task-number: related to QTBUG-6444 Task-number: QTCREATORBUG-698 Reviewed-by: Richard Moe Gustavsen (cherry picked from commit 90dfb5e5d8fc8cb841b0762cd88aa4b996c38312)
* Do not beep on Mac when pressing some keys.Denis Dzyubenko2011-06-094-4/+17
| | | | | | | | | | When a key event is delivered to widgets, we should accept the event if the widget reacted to it in any way - if either the current item has changed or if the widget scrolled. Task-number: QTBUG-6444 Reviewed-by: Prasanth (cherry picked from commit 77230f7ec9e78ec2d57629ea934ceb1d59eb391e)
* Fixed a potential crash in headerview when inserting a sectionThierry Bastian2011-06-092-6/+17
| | | | | | | | This could happen if a section was moved andthen hidden Task-number: QTBUG-8650 Reviewed-by: Andy Shaw (cherry picked from commit f9b0efc17962df74a67d81daca5814af93a5fb97)
* Fix a sizing issue of message box on windows Vista/7Thierry Bastian2011-06-091-11/+38
| | | | | | | | | The problem is that the font changes after the creation of the buttons and we were setting a fixed size to the datails button. Task-number: QTBUG-8381 Reviewed-by: gabi (cherry picked from commit ee379340fcc5ebf8625906f42540c0fb3577f9ac)
* Make sure the delete and backspace keys are ignored when keyb-searchingThierry Bastian2011-06-091-0/+2
| | | | | | Task-number: QTBUG-8270 Reviewed-by: gabi (cherry picked from commit b912cac358a0a84f72f727767772caad22062a45)
* QNetworkReply: Fix canReadLine()Markus Goetz2011-06-094-1/+33
| | | | | Reviewed-by: Peter Hartmann (cherry picked from commit dd6c5cad88a56fb3a342fe9d4fc3b113ffe3fd53)
* Fixed problem displaying half width character as full widthDaisuke Kameda2011-06-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | There is the problem that Qt displays half width character (e.g. alphabet) as full width. This is reported in #QTBUG-1726. This occurs in the following fonts. - Monospace font - Selif font - IPA font (Ver.0301) - NSimSun In Cario and fontconfig, the FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH is specified as flag of FT_Load_Glyph function to solve this problem. According to the document of freetype, this flag exists to support buggy CJK fonts. So this flag is specified as default flag of QFontEngineFT. Merge-request: 2319 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> (cherry picked from commit f18e95849be93b86ff014147086fa538993abc21)
* Fixed rounded SVG rectangles when 'rx' or 'ry' is 0.Kim Motoyoshi Kalland2011-06-091-2/+2
| | | | | | Task-number: QTBUG-8264 Reviewed-by: Trond (cherry picked from commit fb27eba721b41cb1b8557ffff663f9747a3922db)
* Slow QTreeView::layout() with many (> 10000) childrenGabriel de Dietrich2011-06-092-15/+51
| | | | | | | | | | | | | | | When updating the QTreeViewItem::total field in layout(), we used to call QTreeViewPrivate::viewIndex() to get the parent item, which is O(n). We have now introduced 'parentItem' in QTreeViewItem wich makes this O(1), with a small penality when inserting and removing elements in QTreeViewPrivate::viewItems. The QTreeViewPrivate::checkViewItems() is left inside the code for further debugging. Reviewed-by: Olivier Task-number: QTBUG-8885 (cherry picked from commit 7baaea978200c82fdf65e3934cfa373edeca6524)
* Added clipping to the dashed stroke processor in the GL2 engine.Kim Motoyoshi Kalland2011-06-094-30/+105
| | | | | | | | | | Without clipping, the stroker could consume a huge amount of memory when scaling up cosmetic, dashed strokes. I also made QDashStroker clip more aggressively. Task-number: QTBUG-7832 Reviewed-by: Samuel (cherry picked from commit ee6c26115959f46621f5a45f3fbe4a49989fd095)
* Cocoa: Fix misaligned text between format changesEskil Abrahamsen Blomfeldt2011-06-091-1/+1
| | | | | | | | | | | | | | | | | | | | This reverts part of commit e008504b5ec34975e34adf3b1a2b7170d0e4dd38. The original commit aimed to round up all fractional numbers for the font to "improve appearance". Rounding up the last advance of a set of advances in a glyph layout, however, breaks text layout completely, since the layout of text will be different depending on how many text lines is used to represent it (since the last glyph in each line will have a higher advance than the others.) This was e.g. visible in Qt Creator when turning on whitespace visualization, as all spaces then created a format change, thus a new text line in the text layout, and hence an increase of X pixels in the positioning of the text after the space, where 0.0 < X < 1.0. I see no negative results of removing the rounding, but if there are any problems, it has to be fixed in the usage of the advances not in the advances themselves. Task-number: QTCREATORBUG-381, QTBUG-8791 Reviewed-by: mae (cherry picked from commit ef9e7168a8ed3e8149204cf6c604a38db35245c0)
* Don't write byte-order-mark after seek()Paul Olav Tvete2011-06-092-1/+60
| | | | | | | | | | | Ideally, we should write a BOM after seek(0) if setGenerateByteOrderMark has been called, but we don't store that information. This commit is an improvement for the default case when generateByteOrderMark is false, and also when seeking to any other position than 0. Task-number: QTBUG-6295 Reviewed-by: Olivier (cherry picked from commit 7837de27309c958dc5a5985afc55492ec3054ee0)
* QTreeView: let the dataChanged signal refresh the hasChildren attribute.Olivier Goffart2011-06-091-1/+5
| | | | | | | | That is required for the Locals & Watchers view in Creator. Task-number: QTBUG-7115 Reviewed-by: Thierry (cherry picked from commit 3b58b103bfa2e2b9bb12a042cbba36fb0a1baf9f)
* Fixed bounds calculation in QtSvg.Kim Motoyoshi Kalland2011-06-0911-226/+204
| | | | | | | | | | This commit fixes an auto-test failure after fixing QTBUG-8733. The calculated element bounds should now be much tighter and respect the width of non-cosmetic pens. Task-number: QTBUG-8733 Reviewed-by: Trond (cherry picked from commit ea9f2aeba6f18d19d6a82b3a829373ec032af14f)
* Fixed vector-effect property output from QSvgGenerator.Kim Motoyoshi Kalland2011-06-093-24/+19
| | | | | | | | | | The vector-effect property is not inherited by default, so it must be set on each item with a stroke. It is not sufficient to set it on G nodes. Task-number: QTBUG-8733 Reviewed-by: Trond (cherry picked from commit 7b500ed543bb86429ef6fdb82b103784d6cc6a0c)
* Change behavior of applicationShouldTerminate.Fabien Freling2011-06-091-8/+5
| | | | | | | | | We now terminate the application as long as Qt says we can. If not, then we cancel the termination. Task-number: QTBUG-6296 Reviewed-by: Morten Sorvig(cherry picked from commit 12308db7663679e42c87aa72c564ec3f9f1a457f)
* QHeaderView: fixes sectionClicked() emitted with wrong section indexOlivier Goffart2011-06-092-5/+73
| | | | | | | | | | | | | | The obvious fix is to use the previsously computed 'section' as paramatter. (It is even faster) But one might wonder why logicalIndexAt() does not return the same result before and after flipSortIndicator(). The reason is that while being sorted, in _q_layoutChanged, all the hidden section where unhidden and hidden again. Leaving some pending computation. Task-number: QTBUG-7833 Reviewed-by: Gabriel (cherry picked from commit 188c2ef11e92d04dcf334309c85a7f1b14945aaa)
* QRegExp::pos() should return -1 for empty/non-matching capturesJoão Abecasis2011-06-092-3/+101
| | | | | | | | | | Instead, we were returning 0, even if this index did not belong to the match. Task-number: QTBUG-7049 Reviewed-by: Volker Hilsheimer Reviewed-by: Olivier Goffart (cherry picked from commit dadb99ea2c59d7d0f7a83134b7df5aaaaf80a995)
* Fix point drawing in QPainter.Gunnar Sletta2011-06-091-1/+1
| | | | (cherry picked from commit 533bf9e4b7bda99c589f14fb308fa75231196703)
* Fix GL viewports under -graphicssystem raster.Gunnar Sletta2011-06-091-2/+3
| | | | | | | GL widgets and native controls have paintonscreen set and bypasses backingstore. They can thus not rely on the windowsurface flushing but must be repainted via normal means (cherry picked from commit ac99b3e243b331d26815b80aab97cdaf0ed06b0f)
* Cocoa: Sheets loose their opacity on 2nd showRichard Moe Gustavsen2011-06-091-2/+3
| | | | | | | | | | | It turns out that setParent_sys is wiping out opacity for the window regardless of what the value is from before. This patch does the correct thing, namely look at the WA_WState_WindowOpacitySet flag. Task-number: QTBUG-5100 Reviewed-by: cduclos (cherry picked from commit 06638a4c08aaf86d606abc59f642c3c34815e8e6)
* QSortFilterProxyModel: Sorting occured unnecessarily when the ↵Olivier Goffart2011-06-092-8/+38
| | | | | | | | | | | | | | | dynamicSortFilter is turned off We should not sort when inserting items if the dinamicSortFilter flag is set to false. Note that some of the test used to rely on the fact that it was sorted. Those test have been fixed. The patch has been contributed to us in the task. Task-number: QTBUG-7716 Reviewed-by: Thierry (cherry picked from commit 895b9bedc3746723f6c77754df3c428dbc0661d3)
* QNativeSocketEngine: Fix some error handling related to waitFor*()Markus Goetz2011-06-092-0/+31
| | | | | | Task: QTBUG-7054 Reviewed-by: Peter Hartmann (cherry picked from commit 8aaa61f8ea11c6e5794b5a3f6bf14bbbcb712074)
* Incorrect mouse coordinates used when compressing WM_MOUSEMOVE messages.Prasanth Ullattil2011-06-091-1/+4
| | | | | | | | | Use the coordinates passed in the LPARAM parameter, the pt passed with the MSG is not always correct. Task-number: QTBUG-7637 Reviewed-by: Denis (cherry picked from commit 234e849cfc85d5618d2f703bb92701042993d2de)
* Reusing sheets on Mac OS X 10.5 & above shows painting artifacts.Prasanth Ullattil2011-06-091-0/+2
| | | | | | | | | | | Window modal dialogs are shown as sheets on Mac, reusing them is showing some painting artificats. So make sure we create a new window everytime a sheet is shown. This only applies to Carbon, the Cocoa versions dont have this problem. Task-number: QTBUG-8198 Reviewed-by: MortenS (cherry picked from commit 08ec00c081ce51a924c65df3998657174f9428b6)
* Designer:Fix undo crash caused by special handling of key move.Friedemann Kleint2011-06-096-90/+177
| | | | | | | | | | Remove special handling and storing of commands. Customize SetPropertyCommand such that it is able to perform a transformation of the new value., thus, the same (relative) distance can be used on all widgets and the normal command merging mechanism can be used to merge subsequent moves correctly. Task-number: QTBUG-8213 (cherry picked from commit 96be992ccdc7a9aaf02672234be7bd341be105e7)
* Designer: Emit QDesignerPropertyEditorInterface::propertyChanged().Friedemann Kleint2011-06-093-5/+23
| | | | | | | | | | Broken by introduction of new signal with extended parameters. Emit both signals and block against each other. Tested against Eclipse integration. Reviewed-by: Jarek Kobus <jkobus@trolltech.com> Task-number: QTBUG-7764 (cherry picked from commit fe2611f98fd4167cd4746100f062380cbc72f6bd)
* QSortFilterProxyModel: Fix dynamic sorting when severals rows are added.Olivier Goffart2011-06-092-6/+79
| | | | | | | | | | | | | | | | | | | We need to update the sorting column in clear_mapping. But the problem is that updating the source column create a mapping (because it uses mapToSource). So we need to clear that wrong mapping again In _q_sourceLayoutChanged there was an uneeded special case. The case where the source_sort_column might change was never triggered because of that. So now that the special case has been removed, we need to do as in clear_mapping. The test cover the change in clear_mapping and in _q_sourceLayoutChanged The problem was shown in the Kopete: https://bugs.kde.org/show_bug.cgi?id=199850 Reviewed-by: Thierry Task-number: QTBUG-7537 (cherry picked from commit 7b96944a02991e404cdab61e24182b90f5849120)
* QStyleSheetStyle: Fixed some text croped when having padding with native border.Olivier Goffart2011-05-232-1/+58
| | | | | | | | | The native border width need to be taken into account in QRenderRule::boxRect() Task-number: QTBUG-6855 Reviewed-by: Benjamin Poulain (cherry picked from commit 6e90192b599cee9b903177a0978198326f667613) (cherry picked from commit 71f7c1d006d0942fb91e795855bd00a35f226385)
* Fixed gradients on text when coordinate mode != logical mode.Kim Motoyoshi Kalland2011-05-231-0/+30
| | | | | | Task-number: QTBUG-6395 Reviewed-by: Samuel (cherry picked from commit 22573ddffc28135fba2dbb9eb2d50a76cae0a09c)
* Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵v4.6.3Simon Hausmann2010-06-013-2/+12
| | | | | | | | | | | | | | | | | | ( b9dcd9c168d9b25deb020837a67f30c2d72c9afb ) Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2010-05-19 Denis Dzyubenko <denis.dzyubenko@nokia.com> Reviewed by Kenneth Rohde Christiansen. When creating the UA, do not sassmue the language code is a two-letter iso639-1 code. * Api/qwebpage.cpp: (QWebPage::userAgentForUrl): (cherry picked from commit 704dfe0bf4a85cb203a6bb84ab2a3db0b92d3d6b)
* Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-06-012-12/+28
| | | | | | | | | ( 3bb0df4f00fa0b3ac3abc1b6fe508080fabdeaab ) Changes in WebKit/qt since the last update: * [Qt] Update the Symbian version for the user agent -- https://bugs.webkit.org/show_bug.cgi?id=38389 (cherry picked from commit 4bdd6722218ce2afb11b3b12e261f81d41aef82f)
* Always construct s60 screen furniture even if not used.Janne Koskinen2010-06-011-4/+1
| | | | | | | | | Not creating screen furniture in full screen caused regression when swapping into idle screen and back on Nokia 5800. Task-number: QTBUG-10985 Reviewed-by: Jason Barron (cherry picked from commit 4a4e5e7d54c559d54e9079dacb9c2fd32770f018)
* Change to release licenses for 4.6.3.Jason McDonald2010-05-308885-115693/+115693
| | | | Reviewed-by: Trust Me
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-285-434/+76
|\ | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Update def files for 4.6.3
generated by cgit v0.12 at 2025-04-12 22:53:23 (GMT)