summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* More test for QByteArray::fromBase64 that tests invalid inputOlivier Goffart2009-08-261-0/+54
|
* doc: fixes qdoc warnings/errors related to the Graphics Effect framework.Bjørn Erik Nilsen2009-08-263-72/+145
| | | | Reviewed-by: Kavindra
* Avoid undefined text metrics when GetTextMetrics() in QFontEngineWinEskil Abrahamsen Blomfeldt2009-08-261-1/+3
| | | | | | | | | | If GetTextMetrics() should fail, the results are undefined. When the undefined data are used, e.g. when painting text, this can cause a crash. To avoid the crash and make it clear that the metrics cannot be retrieved, we zero out the entire structure. Task-number: 251172 Reviewed-by: gunnar
* Revert "qglobal.h now has the definition for WINVER"Thierry Bastian2009-08-261-0/+7
| | | | | This reverts commit f7ebdd380d16a7be9713930b5ab41c32e996dcdb. defining WINVER in qglobal.h is about to be reverted.
* Compile fix for mingwThierry Bastian2009-08-262-3/+1
|
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-08-261-1/+1
|\
| * Remove superfluous '.data()' call from dashStroker.Jason Barron2009-08-261-1/+1
| | | | | | | | | | | | | | The extra ".data()" call is not needed here because QScopedPointer overloads operator!() to do the right thing here. Reviewed-by: Eskil Blomfeldt
* | Doc: Noted a limitation in using slashes in settings section names.David Boddie2009-08-261-3/+3
|/ | | | | Task-number: 254511 Reviewed-by: Trust Me
* Fix column number in QScriptEngineAgent with JIT enabledJedrzej Nowacki2009-08-261-0/+1
| | | | | | | Column number in executed JS source code is correctly passed to debugger. Few autotest were repaired. Reviewed-by: Kent Hansen
* Fixes typo in doc and missing return in anchor layoutLeonardo Sobral Cunha2009-08-261-2/+4
| | | | Reviewed-by: janarve
* QToolbar now collapses when draggedThierry Bastian2009-08-263-5/+5
| | | | | | | Previously it wouldn't and the layout could appear to be broken. Task-number: 248817 Reviewed-by: Gabriel De Dietrich
* fix performance issue with QScriptValue::propertyFlags()Kent Hansen2009-08-264-28/+52
| | | | | | | Calling QScriptEngine::toStringHandle() is dead slow, so don't call it; use JSC::Identifier directly. This is the same issue as was fixed for setProperty() in commit a8574172dd5e6bc11cf6f69b6fad5a063549e88d.
* Added missing precision specifiers to custom shader effect.Samuel Rødal2009-08-265-9/+9
| | | | | | The precision specifiers need to be there on OpenGL ES 2.0. Reviewed-by: Tom
* implement proxying of JSObject::putWithAttributes() on Global ObjectKent Hansen2009-08-263-0/+38
| | | | | | Otherwise the property is stored on the wrong object (the proxy). This fix makes the Qt bindings generated by qtscriptgenerator work again.
* Removing FONT_OUTLINE_TWEAK from the deform demoAlessandro Portale2009-08-261-12/+0
| | | | | | | | | | That -no obsolete- tweak was mainly there because S60FontEngine was originally not returning glyph outlines. Task-number: 259979 Reviewed-by: jbarron modified: demos/deform/pathdeform.cpp
* Update auto-test after 97cec103793a4b9aae8337ffc2ce9a2bd98fb5fcBjørn Erik Nilsen2009-08-261-19/+24
| | | | | We replaced the convolution filter in the drop shadow effect with a blur filter; we have to update the test accordingly.
* Doc - Completed review of documentation for the QGraphicsEffect group ofKavindra Devi Palaraja2009-08-261-77/+95
| | | | | | classes Reviewed-By: TrustMe
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jason McDonald2009-08-261-1/+3
|\
| * Fix warning.Olivier Goffart2009-08-261-1/+3
| | | | | | | | | | | | The member need to be initialized in the same order as in which they are declared Reviewed-by: Thierry
* | Fix duplicated license headers.Jason McDonald2009-08-2612-492/+0
|/ | | | Reviewed-by: Trust Me
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jason McDonald2009-08-2661-130/+255
|\
| * Fixed compilation on gcc 3.3 and mutex locker lifetimeThorbjørn Lindeijer2009-08-261-1/+1
| | | | | | | | | | | | | | This fixes the lifetime of the mutex locker, since before it would already be destroyed on the next line. Reviewed-by: Olivier Goffart <olivier.goffart@trolltech.com>
| * Fix "We mean it." comments in graphicsviewOlivier Goffart2009-08-2610-20/+20
| |
| * fix warnings on Windows CEJoerg Bornemann2009-08-266-4/+11
| | | | | | | | | | | | | | Lots of warnings in the qreal == float case. Some Q_UNUSED added. Reviewed-by: thartman
| * remove some platform-specific expected failures in JS testsuiteKent Hansen2009-08-261-47/+0
| | | | | | | | | | | | These might work with the new JavaScriptCore-based back-end. Will re-add any expected failures once the autotest results are in from the platforms tested on Pulse.
| * QXmlSimpleReader: fix crashFrank Osterfeld2009-08-261-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | Don't crash when parsing "<?xml version=\"1.0\" encoding=\"iso-8859-1\" ?><guid><http://www.foo.dk/artikel/8938</guid>" (unmatched "< tag followed by "foo:") using QDomDocument::setContent together with a QXmlSimpleReader with the "http://xml.org/sax/features/namespaces" feature enabled. Fixes task tracker issue 254700. See there for a test case. Merge-request: 1322 Reviewed-by: Peter Hartmann <peter.hartmann@trolltech.com>
| * Make the 'effects' examples compile when qreal == float.Jason Barron2009-08-262-2/+2
| | | | | | | | | | | | | | | | | | All of the types supplied to qBound() must be the same and in the case where qreal is typedef'ed to a float, this is not the case because the outer 2 arguments are considered doubles. We explicitly cast them to qreal to guarantee they are all the same type. Reviewed-by: bnilsen
| * Skip the 'symbian' tests on other platforms.Jason Barron2009-08-261-1/+3
| | | | | | | | | | | | | | Add "requires(symbian)" to the .pro file so this test will not be executed on other platforms. Reviewed-by: Rohan McGovern
| * Regression found in 4.5.2 and 4.6: artifacts when scrolling during animation.Gabriel de Dietrich2009-08-261-0/+60
| | | | | | | | | | | | | | Auto-test submitted. Task-number: 259503 Reviewed-by: bnilsen
| * Make QWS compile with namespacesPaul Olav Tvete2009-08-2617-35/+66
| | | | | | | | Reviewed-by: hjk
| * Fixed clipping bug in GL 2 paint engine (visible in arthur demos).Samuel Rødal2009-08-261-1/+1
| | | | | | | | | | | | | | | | | | | | QVectorPath::hints() is not a strict bit field, and thus can not be anded with RectangleHint. Instead, QVectorPath::shape() should be directly compared with RectangleHint to check if the vector path is a rectangle or not. In this case the first four points of a regular painter path were treated as a rectangle with dire consequences. Reviewed-by: Tom
| * QLineEdit: reenable the delete action from the context menuThierry Bastian2009-08-266-13/+29
| | | | | | | | | | | | | | We now need to connect to the slot in the QLineControl and not to the slot of the QLineEdit (the QLineEdit slot is now also removed). Reviewed-by: Alan Alpert
| * compile fix with namespaceshjk2009-08-2613-1/+48
| | | | | | | | 13 pairs missing...
| * Cocoa, the menus can be disabled after a modal dialogRichard Moe Gustavsen2009-08-261-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Why this happends is a bit blurry. From before, I know that cocoa is a bit buggy regarding setting a menu item hidden or not. The solution back then resulted in the function syncNSMenuItemEnabled in qmenu_mac.mm. This patch basically applies the same (silly) trick; disabling the menuitem before enabling it. This seems to force an update to the menu items enabled state. For the record: this is not a fix that I embrace. I hope we can remove it again some day. See task for how to reproduce. Task: 259600 Rev-By: alexis
* | Fix license headers.Jason McDonald2009-08-2612-328/+164
|/ | | | Reviewed-by: Trust Me
* Fix another minor copy'n'paste error from QLineControl refactoringAlan Alpert2009-08-261-2/+2
| | | | | | | | Had left the cursor flash time as half the QApplication cursor flash time by mistake. The new function sets the whole period and not just the time between toggling cursor visibility. Reviewed-by: Trust Me
* Make IDirectFBImageProvider enabled by defaultAnders Bakken2009-08-252-3/+3
| | | | | | | To prevent using IDirectFBImageProviders one can define QT_NO_DIRECTFB_IMAGEPROVIDER Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Ensure that windows are double buffered in DFBAnders Bakken2009-08-251-1/+1
| | | | Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Render cursor with a window in dfb if desiredAnders Bakken2009-08-253-4/+171
| | | | | | | | Some DFB implementations do not support rendering the cursor using the intended interfaces. In these cases one can define QT_DIRECTFB_WINDOW_AS_CURSOR and use a window to render the cursor. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Implement support for keeping image provider aliveAnders Bakken2009-08-254-1/+42
| | | | | | | | | | | If you define QT_DIRECTFB_IMAGEPROVIDER_KEEPALIVE we make sure atleast one IDirectFBImageProvider is alive at all times. Apparently this is refcounted by DirectFB on atleast one implementation and there's considerable overhead involved when releasing the last/creating the first image provider. Reviewed-by: TrustMe
* Implement support for DirectFB image providersAnders Bakken2009-08-254-4/+172
| | | | | | | | | Reimplement QPixmapData::fromFile/fromData to load images using IDirectFBImage providers. This functionality might be accelerated on embedded boards and could have potentially large performance enhancements. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Optimize QDirectFBPaintDevice::bytesPerLineAnders Bakken2009-08-251-1/+1
| | | | | | | If we actually need it locked we'll probably need it locked for read|write. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Refactor QDirectFBPaintDevice/QDirectFBPixmapDataAnders Bakken2009-08-258-31/+70
| | | | | | Move format into QDirectFBPaintDevice. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Doc - Removed a trailing whitespace and more cleanupsKavindra Devi Palaraja2009-08-251-11/+6
| | | | Reviewed-By: TrustMe
* Doc - Reviewing documentation for QGraphicsEffect and QGraphicsEffectSourceKavindra Devi Palaraja2009-08-251-24/+30
| | | | Reviewed-By: TrustMe
* QTableWidget didn't repaint a cell after takeItemThierry Bastian2009-08-251-0/+2
| | | | | | | | The problem was that the mode was not emitting dataChanged. Note: This still needs to be autotested. Task-number: 234641 Reviewed-by: ogoffart
* Fix a leak in the stylesheet textOlivier Goffart2009-08-251-3/+4
| | | | Also include some spaces fix
* QWidgetanimator: the animations are children of the widget they animateThierry Bastian2009-08-251-1/+1
| | | | | | This will remove a false pmemleak under valgrind. Reviewed-by: ogoffart
* Fixed documentation and use of incorrect entry point for custom shaders.Samuel Rødal2009-08-253-15/+10
| | | | | | | The entry point has been changed to be customShader, taking source image and texture coordinates as parameters. Reviewed-by: Tom
* Removed warnings / debug output in the GL 2 engine / pixmap filter code.Samuel Rødal2009-08-253-4/+1
| | | | Reviewed-by: Tom