summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jason McDonald2009-08-274-1/+108
|\
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Keith Isdale2009-08-27244-2232/+4702
| |\
| | * compile on x11Gunnar Sletta2009-08-271-1/+1
| | |
| * | Add new manual test to check if CMYK encoded JPEG look the same whenKeith Isdale2009-08-273-0/+107
| | | | | | | | | | | | | | | | | | | | | | | | scaled New manual test for QImageReader and jpeg image loader plugin Task-number: 260192
* | | Fix some missing and duplicated license headers.Jason McDonald2009-08-2719-80/+641
| |/ |/| | | | | Reviewed-by: Trust Me
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-08-2779-474/+2550
|\ \ | | | | | | | | | | | | | | | Conflicts: src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
| * | Make QGLShader::ShaderType slightly more future proof byGunnar Sletta2009-08-272-8/+18
| | | | | | | | | | | | | | | | | | making it into a bitmask. I'll add GeometryShader in the future Reviewed-by: Rhys Weatherley
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-08-272-35/+33
| |\ \
| | * | Fixes invalid use of staticsBill King2009-08-272-35/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Multiple database connections could have differing ideas on the return value for defaultCase. The cost of the call is so minimal that caching is unnecessary, and static caching is very very wrong. Reviewed-by: Justin McPherson
| * | | API improvements for creating shaders from filesRhys Weatherley2009-08-272-52/+28
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It used to be possible to derive the shader type from the file extension, but this isn't very extensible and doesn't capture the usual extensions. Change it so that the shader type must be supplied explicitly. Also add the addShaderFromFile() function to QGLShaderProgram to provide a convenient short-cut for file-based shader creation. Reviewed-by: Sarah Smith
| * | Optimize permanentState/setPermanentStateAnders Bakken2009-08-261-9/+6
| | | | | | | | | | | | | | | | | | No need to use a QDataStream here. Reviewed-by: Donald Carr <donald.carr@nokia.com>
| * | Remove bufferImage stuff from dfbwindowsurfaceAnders Bakken2009-08-262-41/+0
| | | | | | | | | | | | | | | | | | | | | Neither grabWidget nor buffer is ever called from Qt and they're not public API Reviewed-by: Donald Carr <donald.carr@nokia.com>
| * | Implement QDirectFBScreen::surfaceForWidgetAnders Bakken2009-08-264-0/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow applications to get a pointer to the surface of the window surface for a given widget or a subsurface of the widget. This function ignores whether or not the widget is fully or partially obscured. Reviewed-by: Donald Carr <donald.carr@nokia.com>
| * | ignore warning in autotestKent Hansen2009-08-261-0/+1
| | |
| * | make JIT construct objects of type QScriptObject, not JSC::JSObjectKent Hansen2009-08-261-0/+8
| | | | | | | | | | | | | | | Commit 25e76959da84fe4c40f98cf32b7b8c69e5087681 changed it for the interpreter, this commit makes it work with the JIT enabled as well.
| * | warn if QScriptValue::setScriptClass() is called on incompatible objectKent Hansen2009-08-262-7/+29
| | |
| * | doc: Add Graphics Effect images.Bjørn Erik Nilsen2009-08-269-3/+17
| | |
| * | Use QScopedPointer instead of homegrown smartptrAnders Bakken2009-08-261-30/+29
| | | | | | | | | | | | | | | | | | | | | Since QScopedPointer can take a custom cleanup handler we can use this instead of the original QDirectFBPointer. Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
| * | Missing ducumentation in QAbstractItemModelOlivier Goffart2009-08-261-0/+34
| | |
| * | 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.
generated by cgit v0.12 at 2025-09-04 10:57:36 (GMT)