summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Re-added the Close button in QPrintPreviewDialog for Mac/Carbon.Trond Kjernåsen2010-01-271-0/+10
| | | | | | | | | Modal Mac/Carbon dialogs do not have the close, minimize and resize window title buttons enabled, which makes it very hard to close modal dialogs. Task-number: QTBUG-7481 Reviewed-by: Kim
* revert parts of 10392eef4fd4f9Joerg Bornemann2010-01-271-26/+24
| | | | | | We can't call QCOMPARE from within a nested function, because the return statement will just exit that function. VERIFY_COLOR can't be turned into a function this way.
* Fix y-inverted pixmaps properly.Gunnar Sletta2010-01-271-9/+5
| | | | | | | | | | | | There is a lot of code depending on that pixmaps are flipped upside down in the gl graphicssystem, so toggling this requires extensive testing. Since we're anyway questioning the relevance of this feature (compared to raster + GL viewport) its simply not worth the effort to fix it properly right now. Revert "Fixed y-inverted pixmaps on N900." This reverts commit 57473d5d2a7bd6ae3117f61ff29264a1b790bb01.
* Fix rendering with simple shader in GL2 engineTom Cooksey2010-01-271-0/+3
| | | | | | | | Need to bind the PMV matrix's attributes to their indexes in the simple shader, which is created in a seperate code path to all the other shaders. This should fix the qgl autotest failures. Reviewed-By: TrustMe
* removed a debug traceThierry Bastian2010-01-271-2/+0
|
* Fix documentation bug in QColorGunnar Sletta2010-01-271-7/+4
|
* Only send QGraphicsItem::ParentChange(d) notifications from setParentItem.Bjørn Erik Nilsen2010-01-273-20/+28
| | | | | | | | | | | | | | | QmlGraphicsItem doesn't need any parent change notifactions so we can call the helper class (QGraphicsItemPrivate::setParentItemHelper) direclty from QmlGraphicsItem::setParentItem. This avoids a lot of unnecessary instructions related to QVariant constructions as well as virtual function calls. I've made the variant pointers explicit in the declaration of setParentItemHelper so that we don't accidentally call setParentItemHelper from places where we need parent change notifications. Task-number: QTBUG-6877 Reviewed-by: alexis
* Pass value as const void *const to QGraphicsSceneIndex::itemChange.Bjørn Erik Nilsen2010-01-275-12/+12
| | | | | | | | | We need this change in order to bypass some of the QVariant itemChange notifications from QGraphicsItem::setParentItem. All this is internal stuff and we know what we do, so I don't consider the change too ugly. Task-number: QTBUG-6877 Reviewed-by: alexis
* Optimize QGraphicsItem::setFlags.Bjørn Erik Nilsen2010-01-271-9/+21
| | | | | | | | | We don't have to do a full blown QGraphicsItem::setFlag call from QGraphicsItem::setFlags, only to change the ItemStacksBehindParent bits. We can do it directly (with care). Task-number: QTBUG-6877 Reviewed-by: alexis
* Optimize QGraphicsScenePrivate::itemAcceptsHoverEvents_helperBjørn Erik Nilsen2010-01-271-4/+4
| | | | | | | | Make sure we do cheap tests before the more expensive ones. This function is called from QGraphicsScene::addItem. Task-number: QTBUG-6877 Reviewed-by: alexis
* Improve performance of QGraphicsItem::setParentItem.Bjørn Erik Nilsen2010-01-273-35/+62
| | | | | | | | | The biggest optimization here is "updateAncestorFlags()". It's much faster to update all the flags rather than trying to enable/disable certain flags according to the current state. Task-number: QTBUG-6877 Reviewed-by: alexis
* Make sure cursor is painted at the correct position when we are using IM.Jan-Arve Sæther2010-01-272-2/+8
| | | | | | | | | When the line edit was refactored into a line control this regression was introduced. This regression was introduced by change fb7d86cf23227302d48db279ec589221d11a1f6a. Task-number: QTBUG-4789 Reviewed-by: Alan Alpert
* Purely cosmetic (formatting) changes to GL2 engine's GLSLTom Cooksey2010-01-271-333/+357
| | | | | | This makes GLSL dumps _significantly_ easier to read. Reviewed-By: TrustMe
* Use an attribute value for the PMV matrix rather than a uniformTom Cooksey2010-01-275-31/+42
| | | | | | | | | | | | | | This has several advantages: First, updating an attribute value seems to be cheaper than updating a uniform. Second, vertex atribute values are independent of shader program, which means they persist across changing of the shader program. This makes code simpler and reduces GL state changes. Note: Credit goes to Samuel for finding this little gem. :-) For the 25920 solid QGraphicsRectItem test case, this gives 10% improvement on desktop and 27% on the SGX. Reviewed-By: Kim
* Remove unnecessary depth uniform from GL2 engine's GLSLTom Cooksey2010-01-271-6/+0
| | | | Reviewed-By: Samuel
* Doc fixes: Remove some lies from QEasingCurve.Jan-Arve Sæther2010-01-271-3/+3
| | | | Task-number: QTBUG-7418
* Don't use a mutex lock in QPainter::redirection unless strictly requiredGunnar Sletta2010-01-271-3/+36
|
* Fix how we select antialiasing method for text under Mac OS XGunnar Sletta2010-01-271-15/+31
| | | | Reviewed-by: Eskil
* Mac: Calling showFullScreen() then showNormal() on a widget results in top ↵Carlos Manuel Duclos Vergara2010-01-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | menu hiding. The problem here was the way we entered Full Screen Mode. We were using "kUIModeAllSuppressed" which does the following according to the manual: kUIModeAllSuppressed All system UI elements (including the menu bar) are hidden. However, these elements may automatically show themselves in response to mouse movements or other user activity. I changed it to "kUIModeAllHidden", which does the following: All system UI elements (including the menu bar) are hidden. To prevent a change of behavior I added the following option to the SetSystemUIMode: kUIOptionAutoShowMenuBar This flag specifies that the menu bar automatically shows itself when the user moves the mouse into the screen area that would ordinarily be occupied by the menu bar. Only valid for the presentation mode kUIModeAllHidden. Task-number: QTBUG-7625 Reviewed-by: Richard Moe Gustavsen
* Carbon: deleting a QMenu while it's open will cause a crashRichard Moe Gustavsen2010-01-271-14/+18
| | | | | | | | This patch closes the menu bar if it's open when it gets destroyed Task-number: QTBUG-6597 Reviewed-by: cduclos
* Cocoa: qaccessibility test crashesRichard Moe Gustavsen2010-01-273-0/+11
| | | | | | | | | | | | | The reason is that the test first creates a menu bar with an exit item The exit item gets merged into the appmenu (together with a QAction) Then we destroy the menu bar, but leave the exit item in the appmenu untouched. Then we create a new menubar _without_ an exit item macUpdateMenubar will then, at one point, try to access the old exit item's QAction, wich is destroyed a long time ago; crash! This patch will make sure we clear out all actions in the menu bars appmenu when the menubar gets destroyed. Reviewed-by: Prasanth
* Don't crash when comparing JSCore value without engine to non-JSCore valueKent Hansen2010-01-272-4/+23
| | | | | Task-number: None, discovering while doing test refactoring Reviewed-by: Jedrzej Nowacki
* doc: Included a note showing the actual value of UserType.Martin Smith2010-01-271-0/+2
| | | | Task-number: QTBUG-7606
* doc: Corrected misspelled word.Martin Smith2010-01-271-1/+1
| | | | Task-number: QTBUG-7626
* doc: Specified default values for constructors.Martin Smith2010-01-271-0/+5
| | | | Task-number: QTBUG-7628
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-2788-559/+1712
|\
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Pulse Build System2010-01-2733-169/+309
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1: (27 commits) When checking to see if a signal is connected, compare the match-arguments too Do the refcounting of services watched properly. Autotest: make the test valid for multiple Qt versions Cocoa: qfiledialog test spits out memory warnings Drawing fake buttons using QMacStyle+QStyleOptionViewItemV4 lead to crash. Don't use QDebug references. Instead, pass by value. QNativeSocketEngine: Set OS error strings on failed read() QNativeSocketEngine: Also handle unknown errors from socket engine Qt/Cocoa Event Dispatcher Problem in modal dialogs Cocoa: Usage of QMacCocoaAutoReleasePool makes CPU peak Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( a54fd11a3abcd6d9c858e8162e85fd1f3aa21db1 ) Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 0bc66e2d86149e0fb6a33428e4f23ebfe83bfde4 ) 'test -e' is a bashism. It's not available in traditional sh. QFileNetworkReply: Use a QFileEngine Crash when deleting QMainWindow with native toolbar on Cocoa. QNativeSocketEngine_win: Don't mess with linger settings Cosmetic: move the "Alsa support..." line to a more appropriate place Doc: Fixed broken link. Doc: Added a warning about the Accelerated Graphics Driver example. Doc: Fixed installation information for Qt for Embedded Linux. ...
| | * When checking to see if a signal is connected, compare the match-arguments tooThiago Macieira2010-01-261-2/+4
| | |
| | * Do the refcounting of services watched properly.Thiago Macieira2010-01-261-20/+15
| | | | | | | | | | | | Issue found while debugging KDE applications.
| | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Pulse Build System2010-01-2632-147/+290
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1: (25 commits) Autotest: make the test valid for multiple Qt versions Cocoa: qfiledialog test spits out memory warnings Drawing fake buttons using QMacStyle+QStyleOptionViewItemV4 lead to crash. Don't use QDebug references. Instead, pass by value. QNativeSocketEngine: Set OS error strings on failed read() QNativeSocketEngine: Also handle unknown errors from socket engine Qt/Cocoa Event Dispatcher Problem in modal dialogs Cocoa: Usage of QMacCocoaAutoReleasePool makes CPU peak Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( a54fd11a3abcd6d9c858e8162e85fd1f3aa21db1 ) Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 0bc66e2d86149e0fb6a33428e4f23ebfe83bfde4 ) 'test -e' is a bashism. It's not available in traditional sh. QFileNetworkReply: Use a QFileEngine Crash when deleting QMainWindow with native toolbar on Cocoa. QNativeSocketEngine_win: Don't mess with linger settings Cosmetic: move the "Alsa support..." line to a more appropriate place Doc: Fixed broken link. Doc: Added a warning about the Accelerated Graphics Driver example. Doc: Fixed installation information for Qt for Embedded Linux. fix copy-paste error minor optimization ...
| | | * Autotest: make the test valid for multiple Qt versionsThiago Macieira2010-01-262-3/+3
| | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | | * Cocoa: qfiledialog test spits out memory warningsRichard Moe Gustavsen2010-01-261-0/+3
| | | | | | | | | | | | | | | | | | | | We need an auto release pool! (cherry picked from commit 7ad08868de4b3e481a51a3431504fcf42a4bbf6d)
| | | * Drawing fake buttons using QMacStyle+QStyleOptionViewItemV4 lead to crash.Carlos Manuel Duclos Vergara2010-01-261-72/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem here is the fact that we "trusted" the user when the widget type was specified. The fix consists in checking the result of the conversions, if the conversion was successful (i.e. the widget was of the type specified by the user) then we proceed as usual. If the conversion was not successful (i.e. wrong widget type) then we ask the style for a sensible size. I modified this for QPushButton, QSlider and QToolButton. Task-number: qtbug-7522 Reviewed-by: jbache
| | | * Don't use QDebug references. Instead, pass by value.Thiago Macieira2010-01-262-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you use refs, then you can't use this operator as the first argument, since qDebug() returns QDebug by-value (an rvalue temporary). That cannot be bound to a non-const ref. Task-number: QTBUG-7593
| | | * QNativeSocketEngine: Set OS error strings on failed read()Markus Goetz2010-01-253-4/+7
| | | | | | | | | | | | | | | | Reviewed-by: thiago
| | | * QNativeSocketEngine: Also handle unknown errors from socket engineMarkus Goetz2010-01-251-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7316 Task-number: QTBUG-7317 Reviewed-by: thiago
| | | * Qt/Cocoa Event Dispatcher Problem in modal dialogsRichard Moe Gustavsen2010-01-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is that we didn't check if the event dispatcher was interrupted before starting to wait for more events. This patch will do the interrupt test after processing modal session events, and just before starting to wait. This will fix applications that expects e.g an event loop to exit immidiatly upon a signal from a timer (without the need for the user to generate e.g. a mouse event to stop the wait). Task-number: QTBUG-7503 Reviewed-by: cduclos
| | | * Cocoa: Usage of QMacCocoaAutoReleasePool makes CPU peakRichard Moe Gustavsen2010-01-252-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reason was that QMacCocoaAutoReleasePool included a a call to NSApplicationLoad(). This call should only be made for carbon based application anyway, so we just ifdef it out (event how clumsy the placing of the call is). The CPU problem came because after the call, [NSApp isRunning] would return true, an as such, confuse the event dispatcher later on. Reviewed-by: MortenS
| | | * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-01-252-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( a54fd11a3abcd6d9c858e8162e85fd1f3aa21db1 ) Changes in WebKit/qt since the last update: Fix from Girish
| | | * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-01-256-13/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( 0bc66e2d86149e0fb6a33428e4f23ebfe83bfde4 ) Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2010-01-25 Janne Koskinen <janne.p.koskinen@digia.com> Reviewed by Simon Hausmann. [Qt] Phone backup support for QtWebkit for Symbian devices. https://bugs.webkit.org/show_bug.cgi?id=34077 * symbian/backup_registration.xml: Added.
| | | * 'test -e' is a bashism. It's not available in traditional sh.Thiago Macieira2010-01-251-2/+2
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7549 Reviewed-By: Markus Goetz
| | | * QFileNetworkReply: Use a QFileEngineMarkus Goetz2010-01-252-19/+38
| | | | | | | | | | | | | | | | | | | | | | | | Slight performance increase. Reviewed-by: Peter Hartmann
| | | * Crash when deleting QMainWindow with native toolbar on Cocoa.Prasanth Ullattil2010-01-251-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The crash happens while processing a paint message received by the NSToolbar after the corresponding QToolbar has been destroyed. So while cleaning up the toolbar, the view needs to be detached from the custom toolbar item. Task-number: QTBUG-7305 Reviewed-by: Carlos Manuel Duclos Vergara
| | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-2513-15/+56
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QNativeSocketEngine_win: Don't mess with linger settings Cosmetic: move the "Alsa support..." line to a more appropriate place Doc: Fixed broken link. Doc: Added a warning about the Accelerated Graphics Driver example. Doc: Fixed installation information for Qt for Embedded Linux. fix copy-paste error minor optimization Autotest: add a test for allowing hostnames ending in dot Fix QUrl::toAce for domains with dot at end Fix NSCFNumber autorelease warning on Mac. Add a reference to adjustSize() from the size property Fix the parallel build of QtWebKit
| | | | * QNativeSocketEngine_win: Don't mess with linger settingsMarkus Goetz2010-01-251-2/+4
| | | | | | | | | | | | | | | | | | | | Reviewed-by: thiago
| | | | * Cosmetic: move the "Alsa support..." line to a more appropriate placeThiago Macieira2010-01-251-2/+2
| | | | |
| | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-2411-11/+50
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Doc: Fixed broken link. Doc: Added a warning about the Accelerated Graphics Driver example. Doc: Fixed installation information for Qt for Embedded Linux. fix copy-paste error minor optimization Autotest: add a test for allowing hostnames ending in dot Fix QUrl::toAce for domains with dot at end Fix NSCFNumber autorelease warning on Mac. Add a reference to adjustSize() from the size property Fix the parallel build of QtWebKit
| | | | | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-01-2262-198/+686
| | | | | |\
| | | | | | * fix copy-paste errorRitt Konstantin2010-01-221-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 442 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| | | | | | * minor optimizationRitt Konstantin2010-01-221-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | avoid needless atomic operations Merge-request: 442 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
generated by cgit v0.12 at 2025-02-28 02:36:37 (GMT)