summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Calling QPen::brush() on a Qt::NoPen pen, should return QBrush::NoBrush.Trond Kjernåsen2010-08-261-0/+2
| | | | | | | | | This could cause some strange things to happen in our fallback code used for e.g. printing, since the brush might be valid and e.g. contain alpha values etc. Task-number: QTBUG-12263 Reviewed-by: Gunnar
* use QFile:map instead of ::mmapArvid Ephraim Picciani2010-08-261-43/+5
| | | | Reviewed-by: janarve
* Merge commit 'v4.7.0-rc1' into 4.7Jesper Thomschutz2010-08-260-0/+0
|\
| * Doc: Fixed qdoc warnings.v4.7.0-rc1Jesper Thomschutz2010-08-2420-47/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Doc: updating getting started docs - not finishedJesper Thomschutz2010-08-244-0/+1604
| | | | | | | | | | | | | | | | (cherry picked from commit b83f3a98fe5688872b4bd9a871e544951cb33e29) Conflicts: doc/src/getting-started/gettingstarted.qdoc
| * Make it possible again to build Qt without webkitSimon Hausmann2010-08-231-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Remove the QT_CONFIG line from the qt_webkit_version.pri file in Qt, because it is only meaningful for separate builds of WebKit. (Real fix is in the import script that takes care of always removing that line) Task-number: QTBUG-12456 Discussed-with: axis (cherry picked from commit 4cd413970b18125885ce60d82a4ad06bce6395a5)
| * Doc: fixing creator bugs, removing menus and textbox in the headerMorten Engvoldsen2010-08-233-6/+14
| | | | | | | | (cherry picked from commit 4aafc4e55e0906be0cc39911b2c1a4ffe71c4d91)
| * Fixing qdoc index file...Commit hack to work around the massive amounts of ↵Jesper Thomschutz2010-08-231-23/+22
| | | | | | | | | | | | dependencies in the upstream branch. Rev-by: MortenE
| * Doc: Fixing overlapping text in header listMorten Engvoldsen2010-08-231-1/+1
| | | | | | | | (cherry picked from commit ccb77caba466fe0e4d28a809129513cefdbd5575)
| * Use Ctrl rather than Alt for switching tabs in the demo browserTor Arne Vestbø2010-08-231-2/+2
| | | | | | | | | | | | | | | | Alt+1, Alt+2, etc produce actual symbols on some keyboard layouts, for example Norwegian, which prevents you from typing the @ symbol. Reviewed-by: Alexis Ménard <alexis.menard@nokia.com> (cherry picked from commit 5b177dd50d1ea0eb9130c631757a687782a23cd3)
| * Doc: add link to new gettings started to index.htmlGeir Vattekar2010-08-231-1/+1
| | | | | | | | (cherry picked from commit 613ab517f46085580e81684cd5072f8c90fe84d5)
| * Doc: Fixing bug involving header misplacement in Creator styleMorten Engvoldsen2010-08-201-2/+2
| | | | | | | | | | Task-number: QTBUG-11408 (cherry picked from commit 997e4161cf937aa34a16bb2e708fa1bc7909355f)
| * 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-192-75/+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)
| * fix loading of module configsOswald Buddenhagen2010-08-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | do it in qt_config.prf instead of in the autogenerated qconfig.pri files. this is waaaay more elegant, and allows us to easily use the magic in that file which avoids loading qt configuration from the qt install dir while building qt itself. Reviewed-by: joerg Reviewed-by: Simon Hausmann Task-number: QTBUG-12698
| * 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)
| * Fix configure -help output. declarative module is built by default.Martin Jones2010-08-181-2/+2
| | | | | | | | | | Task-number: QTBUG-12840 (cherry picked from commit d904fe2273be5d39b54b987eef6b9cc0d1b85c4b)
| * 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-183-14/+32
| | | | | | | | | | | | | | | | 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)
| * diagramscene example: fix leak and crashes.Olivier Goffart2010-08-182-10/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | In MainWindow::deleteItem, if there is arrow selected, we need to clean up the items from this arrow. We need to delete them first so there is no arrow in the list anymore when we calls removeArrows (which before, deleted arrow that were possibly in the list, resulting in crashes) Also avoid leak by giving parents to objects that needs it, and destroying items. Reviewed-by: Geir Vattekar Task-number: QTBUG-12753 (cherry picked from commit 5dedcd3c4cac993949295d109804a8f7cc3a5b0a)
| * Only modify pixmap cache reply when protected by a mutexAaron Kennedy2010-08-182-1/+11
| | | | | | | | | | QTBUG-12729 (cherry picked from commit ee7c3b576ced47d3b68da1913cdf6995144bddd2)
| * Drawer widget in a MainWindow disappears after returning from full screen mode.Carlos Manuel Duclos Vergara2010-08-182-1/+26
| | | | | | | | | | | | | | | | | | | | 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 check to remove unnecessary deployments in SymbianMiikka Heikkinen2010-08-171-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | Previously check to remove files from deployment in case the deployment target location was the same as the source location was done using QFileInfo equality, which resolved to true when file didn't yet exist at the time qmake was run. Changed the check to compare absolute paths instead. Task-number: QTBUG-12879 Reviewed-by: Shane Kearns (cherry picked from commit 448a8603bb0609bf880a2c1b92b26c2005e1cf63)
| * Fix "installer_sis" and "deploy" targets when TARGET has pathMiikka Heikkinen2010-08-171-3/+2
| | | | | | | | | | | | | | | | | | | | Dependencies got generated wrong in Makefile because sis is always created in the .pro file directory but dependency included path that was in TARGET. Task-number: QTBUG-12884 Reviewed-by: Shane Kearns (cherry picked from commit 434ce6748ea7f082357b6d7ab542c9fa2285bd4c)
| * 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)
| * qdoc: Added the fix to change qml-qml-file.name to qml-file.nameMartin Smith2010-08-161-3/+3
| | | | | | | | (cherry picked from commit 13d35e19a2bf78dd6a63b35f06a07d2b6e9c67c4)
| * 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)
| * Doc: removed assistant style and reintroduced the index page icons.Morten Engvoldsen2010-08-162-41/+4
| | | | | | | | (cherry picked from commit 2dfd16e8a138da9d903b31ef461331016d16ec5b)
| * qdoc: All references to -assistant and -base were removed.Martin Smith2010-08-134-30/+6
| | | | | | | | | | | | Flags allowed are now -creator and -online. -creator is the default. (cherry picked from commit 03d9d3cf641c8dde22a903870ac2b6e58ada6eec)
| * qdoc: added application flags in doc.pri and fixed QTBUG-12388Martin Smith2010-08-132-5/+7
| | | | | | | | | | Task-nr: QTBUG-12388 (cherry picked from commit c1ce7b4b01c1049c61881bb7d701ed68b92a401b)
| * Properly emit geometryChanged() when the position change.Alexis Menard2010-08-132-2/+21
| | | | | | | | | | | | | | | | 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: fixing examples linkMorten Engvoldsen2010-08-131-1/+1
| | | | | | | | (cherry picked from commit 653f180d4697e0c7ec1c58022622d5d140e7fda8)
| * Make bld.inf target in Symbian mkspecs to depend on .pro fileMiikka Heikkinen2010-08-132-8/+15
| | | | | | | | | | | | | | | | | | Changes to .pro file weren't previously noticed and therefore qmake wasn't rerun. Qmake command itself was also incorrect. Task-number: QTBUG-12716 Reviewed-by: Shane Kearns (cherry picked from commit 142ce4d38094f1588b04758a6f9ff6787a784fe3)
| * Gcce building support for symbian-sbsv2Miikka Heikkinen2010-08-134-41/+145
| | | | | | | | | | | | | | | | | | | | It is now possible to use "release-gcce" and "debug-gcce" targets in symbian-sbsv2 mkspec. Exports and cleans should also now work properly for all target platforms under symbian-sbsv2. Task-number: QTBUG-12762 Reviewed-by: Jason Barron (cherry picked from commit bdfbedf971f3e9ef99977652308b9e2b1c213210)
| * Added files that had been renamed.Kevin Wright2010-08-1228-0/+1605
| | | | | | | | (cherry picked from commit a98af1c7f1bba3c791d08e76e4896e48ea6ea019)
| * qdoc: Added list of all members (including inherited) page to QML elements.Martin Smith2010-08-128-24/+113
| | | | | | | | (cherry picked from commit 62968f33452016b31020e524fa6ba6d2cefd0278)
| * doc: The QML Qt element was missing from the documentation.Martin Smith2010-08-122-3/+5
| | | | | | | | | | 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-122-4/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
generated by cgit v0.12 at 2025-08-09 22:36:36 (GMT)