summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* reverting the definition of WINVER and _WIN32_WINNT in qglobal.hJoerg Bornemann2009-08-264-13/+12
| | | | | | | | | | | | This just caused too much problems and must be solved another way. In qfsfileengine_win.cpp we define FSCTL_GET_REPARSE_POINT and all of the other stuff that's needed for NTFS symlink support, if its not defined. This is the case if _WIN32_WINNT is less than 0x0500. All other changes in this commit are just reversions of commits that were done for the infamous qglobal.h change. Discussed with prasanth, tested by pulse.
* Fixed the bubbles.svg file after fixing some bugs in the SVG renderer.Trond Kjernåsen2009-08-263-29/+29
| | | | Reviewed-by: Kim
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-08-2623-84/+1731
|\
| * Made the opengl/overpainting example work with the GL 2 engine.Trond Kjernåsen2009-08-262-3/+9
| | | | | | | | | | | | | | | | | | Since the GL 2 engine can't set/unset every single GL state that a user might possibly change, we have to make a rule that if something is changed from its default state, it needs to be reset before the GL 2 engine can draw correctly. Reviewed-by: Samuel
| * Made GL 2 engine reset various GL state to their defaults in end().Samuel Rødal2009-08-262-3/+10
| | | | | | | | | | | | | | | | This makes mixing GL and QPainter code safer. We need to be able to assume default GL state in begin(), and set back whatever we change to the default state in end() in the GL 2 paint engine. Reviewed-by: Trond
| * Made brush textures in GL2 engine use correct filtering.Samuel Rødal2009-08-261-8/+10
| | | | | | | | | | | | | | Only use bilinear filtering when SmoothPixmapTransform render hint is used. Reviewed-by: Kim
| * Improved GLSL precision specifiers in GL 2 engine.Samuel Rødal2009-08-261-24/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The recommended specifiers are lowp for colors / normal vectors, mediump for texture coordinates when a limited range is sufficient, and highp for generic texture coordinates and vertex coordinates / transformation matrices. We used to use mediump for texture coordinate in some places, but since we don't control the texturing scenarios we need to handle the worst case, which is zooming in on part of a large texture (2048x2048) with bilinear filtering. To properly handle this case without color banding mediump is probably not sufficient, so we'll use highp for texture coordinates. Reviewed-by: Tom
| * Improved QPainter API for allowing native painting in GL / VG.Samuel Rødal2009-08-2611-43/+100
| | | | | | | | | | | | | | | | Previously we were using QPaintEngine::syncState() which is not ideal naming-wise, since it actually prepares for native painting instead of syncing the painter's state to native state. Reviewed-by: Trond
| * doc: Misspelled class names.Bjørn Erik Nilsen2009-08-261-2/+2
| |
| * Fix build of autotest on MSVCThierry Bastian2009-08-261-1/+1
| | | | | | | | Reviewed-by: ogoffart
| * Add move API to QAbstractItemModel.Stephen Kelly2009-08-267-2/+1577
| | | | | | | | | | | | | | | | | | This adds the function beginMoveRows, endMoveRows, beginMoveColumns, endMoveColumns Reviewed-by: Olivier Goffart <ogoffart@trolltech.com> Acknowledged-by: Thierry Merge-request: 972
* | Doc: Corrected incorrect snippets and info in inherits() documentation.David Boddie2009-08-262-7/+6
|/ | | | | Task-number: 201882 Reviewed-by: Trust Me
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-08-2616-114/+387
|\
| * don't crash when attempting to access properties of a JS Object that ↵Kent Hansen2009-08-263-24/+31
| | | | | | | | | | | | | | | | | | | | | | belonged to a deleted script engine When the engine is deleted, the JSValue is invalidated, but the QScriptValue's type will still be QScriptValuePrivate::JSC. Use a new helper function, isObject(), that checks both that the value is of type JSC _and_ that it is valid, before calling JSValue::isObject() (JSValue::isObject() assumes that the value is valid).
| * QMainWindow: adding autotest for the size of the central widgetThierry Bastian2009-08-261-0/+26
| | | | | | | | | | It just ensures that the central widget gets its correct size (ie. sizehint) when a menu bar is present.
| * QAbstractItemView sometimes doesn't allow changing the selectionThierry Bastian2009-08-262-3/+29
| | | | | | | | | | | | | | | | | | | | | | If you do a selection with the mouse and react to selectionChanged by changing the selection. Those changes would be overwritten by QAbstractItemView::mouseReleaseEvent. It is useless to set the selection on mouse release. We already do that on mouse press. Task-number: 250683 Reviewed-by: ogoffart
| * Remove Graphics View dependency from QGraphicsShaderEffect.Bjørn Erik Nilsen2009-08-262-8/+0
| | | | | | | | Graphics effects are no longer in the Graphics View module.
| * tst_QObject: test that we connect to the right signals when there is overloardsOlivier Goffart2009-08-261-3/+91
| | | | | | | | | | This test would not pass if we sorted the signals by alphabetical order in the moc (in order to do a binary search)
| * 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
| |
* | Doc: Added a performance section to the Graphics View overview.David Boddie2009-08-261-0/+20
|/ | | | | Task-number: 253749 Reviewed-by: Trust Me
* 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