summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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)
* 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)
* Fixed missing link tag in declarativeui.qdoc. Fix for QTBUG-12750Jerome Pasion2010-08-111-1/+1
| | | | (cherry picked from commit ac355872573c7131e4b783cabe00c5656dc668af)
* qdoc: Cleaned up the application option specification and use.Martin Smith2010-08-115-116/+95
| | | | | | | | | | The flags allowed on the command line are now: -online (default), -base, -assistant (same as -base), and -creator. If you don't specify one of these, you see a warning in the error output telling you that it didn't find an application flag and that it generated online docs by defualt. (cherry picked from commit d4dceca5dcd9252e09a421b65b318a7178049cd1)
* Made changes to qdoc to allow it to accept a "style level" flagJerome Pasion2010-08-112-1/+48
| | | | (cherry picked from commit a53b98f9269e6ee0b524fe7477e8fb46f189f9d3)
* qdoc: Removed three unused config variables.Martin Smith2010-08-118-24/+0
| | | | | | | | | These no longer do anything in qdocconf files: online = false offline = false creator = true (cherry picked from commit 7de8a0c487ce6a7f13c2028e93648807ef7d8e8b)
* I18N: Update German translations for 4.7.0.Friedemann Kleint2010-08-115-4629/+278
| | | | (cherry picked from commit 7ee7f19502bfd9193c624045bed07bdfdb23d1df)
* I18n: Complete German translation for 4.7.0Friedemann Kleint2010-08-111-2/+44
|
* 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-112-0/+7
| | | | | | | | | | 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-113-2/+29
| | | | | | | | | 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: Adding content to installation guide and fixing printing bugsMorten Engvoldsen2010-08-102-6/+8
| | | | (cherry picked from commit 79797d175c41198b0dffad1dced021a07c5873ae)
* Doc: Correcting bugs in the CSSMorten Engvoldsen2010-08-102-4/+23
| | | | (cherry picked from commit 56cfbce20f736caa1ef74b5706fe3713ebd773c9)
* Cherry-picked from: commit 47ba8dba3fe48d317974acd55afeea8a434c95f8Jesper Thomschutz2010-08-101-453/+728
| | | | | | | | | Had to manually copy the file from that commit since the conflict was so wonky to resolve. Original Author is: Morten Engvoldsen <morten.engvoldsen@nokia.com> Date: Fri Jul 9 21:36:15 2010 +0200 Doc: Cleaning style and adding support for Creator Note: Support for creator has been disabled. HTML-generator needs an update.
* Doc: Correcting img bugMorten Engvoldsen2010-08-101-1/+0
| | | | | Task-number: QTBUG-12028 (cherry picked from commit 0b8a7842975b195a17b3add4c98f64baeaedcf8c)
* Doc: fixing style from 600 to bold weightMorten Engvoldsen2010-08-101-8/+7
| | | | (cherry picked from commit ea7aeec080c9c39449017ff683b27d3659236336)
* doc: Re-introduced next/previous page links in the footer.Martin Smith2010-08-091-0/+55
| | | | | Task-Nr: QTBUG-12278 (cherry picked from commit 2118f407b02654e9e3c6706647e8b9b711e8982b)
* 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-097-514/+3003
| | | | | | | | | 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)
* Some more french translations.qCaro2010-08-091-151/+156
| | | | | Reviewed-by: Pierre (cherry picked from commit 4fd04190ab3800fde261293acd4bcf11cf449dee)