summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix animation-after-zooming problem.Warwick Allison2009-09-022-8/+25
| | | | | | | Ensures final viewport XY is set and that setting it always clears animations (even if the position is coincidentally unchanged). Case is changing width/height twice - once too small, then large enough again, first change starts correction animation, which must be stopped by second change.
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-09-0142-1114/+746
|\ | | | | | | kinetic-declarativeui
| * Rewrite of DirectFB locking mechanismAnders Bakken2009-09-019-92/+185
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DirectFB allows you to have a locked subSurface that remains valid while you paint on the unlocked "parent" surface. The only limitation is that when accessing the locked memory you might have to call DirectFB->WaitIdle() in case pending GPU operations aren't finished. After this we keep the locked surface around at all times (from the first time it's requested) until the surface dies. Previous calls to lock() will just call WaitIdle if necessary and previous calls to unlock now just mark the surface as dirty and in need of a WaitIdle if someone needs to access its pixel data. Reviewed-by: Donald Carr <donald.carr@nokia.com>
| * Make DirectFB compile with Qt in a namespaceAnders Bakken2009-09-015-43/+38
| | | | | | | | Reviewed-by: Donald Carr <donald.carr@nokia.com>
| * Add DirectFB to QScreenDriverFactoryAnders Bakken2009-09-011-2/+7
| | | | | | | | Reviewed-by: Donald Carr <donald.carr@nokia.com>
| * Add directfb.pri to embedded.priAnders Bakken2009-09-011-0/+4
| | | | | | | | Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * Copy directfb.pro to src/gui/embedded/directfb.priAnders Bakken2009-09-012-35/+41
| | | | | | | | Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * Add directfb to CFG_GFX_AVAILABLEAnders Bakken2009-09-011-1/+1
| | | | | | | | | | | | | | This is a first step in making it possible to build DirectFB as part of QtGui. Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * Don't check for null if never happens, but test it if it may...João Abecasis2009-09-011-4/+4
| | | | | | | | | | | | Making coverity happy. Reviewed-by: Olivier Goffart
| * Merge branch '4.5' into 4.6Thiago Macieira2009-09-013-14/+12
| |\ | | | | | | | | | | | | Conflicts: examples/qws/dbscreen/dbscreen.cpp
| | * Fix Solaris build: test isn't test.Thiago Macieira2009-09-011-1/+2
| | | | | | | | | | | | | | | | | | configure: test: argument expected Reviewed-by: TrustMe
| | * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5David Boddie2009-09-017748-96818/+117974
| | |\
| | | * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-09-018-728/+67
| | | |\
| | | * | Fix misformatted license headers.Jason McDonald2009-09-015-59/+44
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | Doc: Fixed broken links to renamed functions.David Boddie2009-09-011-4/+5
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | Autotest which checks you can paint to an fbo in a gl widget's p.e.Tom Cooksey2009-09-011-0/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test mimics examples/opengl/framebufferobjects in that it begins a QPainter on a QGLWidget in it's paint event, then begins a second QPainter on a QGLFramebufferObject, leaving 2 painters active at the same time. When the FBO's painter is ended, GL rendering should be re-targetted at the QGLWidget automatically.
| * | | | Don't seg-fault when printing error message in shader managerTom Cooksey2009-09-011-11/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's very likely that some of the shader objects in required program will be null, as not all are manditory. Check to see if they exist before de-referencing them and asking for their log string. Reviewed-by: Trustme
| * | | | Merge branch '4.5' into 4.6Thiago Macieira2009-09-018-729/+67
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: src/network/access/qnetworkaccessbackend.cpp src/network/access/qnetworkreplyimpl.cpp tests/auto/qabstractnetworkcache/tst_qabstractnetworkcache.cpp
| | * | | Make the existence of the LICENSE.GPL3 file optionalThiago Macieira2009-09-013-703/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The repository no longer carries this license. The final releases will still have it. In any case, the LGPLv2.1 is compatible with the GPLv3. Required-By: Nokia Legal Reviewed-by: Marius Storm-Olsen
| | * | | Re-add check for saving to cache, which was removed by accident.Thiago Macieira2009-09-011-0/+1
| | | | | | | | | | | | | | | | | | | | Discussed with Ben Meyer.
| | * | | QNetworkAccessManager can delete the QAbstractNetworkCache pointer atBenjamin C Meyer2009-09-015-21/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | any point. Rather then keep a separate pointer to the cache in the reply use the pointer kept by the manager so the reply never tries to access a cache pointer that has already been deleted. Autotest: included Merge-request: 1124 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| | * | | Use the QDesktopServices::CacheLocation to determine the location to store ↵Benjamin C Meyer2009-09-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the temporary cache rather than QDesktopServices::DataLocation Merge-request: 1124 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| | * | | Initialize QNetworkAccessBackend's private variables to 0 in the constructorBenjamin C Meyer2009-09-011-2/+7
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | and when creating a CacheBackend set the manager pointer. Merge-request: 1124 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * | | QScriptEngineAgent autotest bug fixJedrzej Nowacki2009-09-011-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default value for script id in tests should be <-1, because -1 mean that there is no script and all numbers >0 are valid. Two test cases were marked as expected to fail. Reviewed-by: TrustMe
| * | | QNAM HTTP Code: Removed unnecessary legacy loopMarkus Goetz2009-09-011-23/+16
| | | | | | | | | | | | | | | | | | | | | | | | Thank you Coverity! Thank you Biochemist! Reviewed-by: joao
| * | | Doc: Stylesheet min/max-width/height are relative to the box content.Geir Vattekar2009-09-011-0/+12
| | | | | | | | | | | | | | | | | | | | Task-number: 235550 Reviewed-by: Olivier Goffart
| * | | Speed-up parsing of SVG path data.Ariya Hidayat2009-09-011-117/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using operations that shuffle the array of numbers, just use pointer to iterate the numbers. This reduced the amount of memory operations during the parsing. In addition, parse the numbers to QVarLengthArray instead of QVector. This works well because usually a path element is typically followed by a short list of numbers. Loading tiger.svg (tests/benchmarks/qsvgrenderer) is now 8% faster, mostly due to the time spent in parsePathDataFast is reduced from 26.1 millions instructions to just 20.5 millions (27% speed-up). Reviewed-by: Kim
| * | | Use QStringRef when parsing SVG transformation matrix.Ariya Hidayat2009-09-011-8/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is really no need to use QString for parsing the matrix, hence use QStringRef. In a complex SVG, this cuts significantly the time spent in parseTransform(). Reviewed-by: Kim
| * | | Doc: Fixed typos in QGraphicsItem and Diagram Scene ExampleGeir Vattekar2009-09-012-17/+17
| | | | | | | | | | | | | | | | | | | | Task-number: 257292 Reviewed-by: Trust Me
| * | | Doc: Fixed outdated docs in QStyle::styleHint().Geir Vattekar2009-09-011-5/+3
| | | | | | | | | | | | | | | | | | | | Task-number: 256745 Reviewed-by: Trust Me
| * | | Tiny doc fix spotted by panter_dsd.Denis Dzyubenko2009-09-011-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: trustme
| * | | Unambiguated QGLFramebufferObject constructor on Mac OS X.Samuel Rødal2009-09-011-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Trond
| * | | Define QT_NO_EXCEPTIONS if we detect that we are building without exceptions ↵Olivier Goffart2009-09-011-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on gcc This is necessary to compile applications that are compiled without exception support (many KDE applications) Reviewed-by: Thiago
| * | | QtNetwork: More Coverity fixesMarkus Goetz2009-09-013-1/+9
| | | |
| * | | An an autotest to check QPainter rendering to an FBO worksTom Cooksey2009-09-011-0/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The test also checks that when we ask for CombinedDepthStencil, that's what we get. Reviewed-by: Samuel
| * | | Create exceptionCatch eventsJedrzej Nowacki2009-09-014-6/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Call to JSC::Debugger::exceptionCatch when exception is catched were added for JIT enabled. Few XFAIL were moved. Reviewed-by: Kent Hansen
| * | | Fix column number in QScriptEngineAgentJedrzej Nowacki2009-09-011-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix column number in QScriptEngineAgent with JIT enabled and in the same time with QT_BUILD_SCRIPT_LIB disabled Reviewed-by: Kent Hansen
* | | | Merge commit 'qt/4.6' into kinetic-declarativeuiBjørn Erik Nilsen2009-09-0185-425/+1235
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: tools/qdoc3/test/classic.css
| * | | QTreeView: exapnding nodes just after replacing the model wouldn't workThierry Bastian2009-09-013-3/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is that deleting the previous model would triggera delayed reset. This reset could happen after the model has changed and nodes are expanded. We can now cancel a reset when reset is called from another place (like when we set a new model). Note: autotest included Task-number: 245654 Reviewed-by: ogoffart
| * | | Cleanup examples/effects/lighting.Bjørn Erik Nilsen2009-09-015-149/+21
| | | | | | | | | | | | | | | | There's no need to re-implement QGraphicsDropShadowEffect anymore.
| * | | Fixes examples/animation/states, supposedly hidden element was appearingLeonardo Sobral Cunha2009-09-011-2/+2
| | | | | | | | | | | | | | | | Reviewed-by: trustme
| * | | Make sub-attaq working without the popup which make it working onAlexis Menard2009-09-017-16/+153
| | | | | | | | | | | | | | | | Mac.
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-09-011-4/+13
| |\ \ \
| | * | | Socket code: Do not use magic buffer size valueMarkus Goetz2009-09-011-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I have seen a performance increase of around 30% for big file transfers on Linux when having high bandwidth and higher latency. Reviewed-by: Thiago
| * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-09-0110-21/+52
| |\ \ \ \ | | |/ / /
| | * | | Coverity: Small fix for QIODeviceMarkus Goetz2009-09-011-1/+6
| | | | |
| | * | | Fix rounding bug in QGraphicsOpacityEffect.Bjørn Erik Nilsen2009-09-011-4/+5
| | | | | | | | | | | | | | | | | | | | The pixmap was painted at wrong offset.
| | * | | Make sure the BSP is updated when a graphics effect changes bounding rect.Bjørn Erik Nilsen2009-09-014-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the case of applying an effect to a QGraphicsItem, we have to notify the scene's BSP that the item's bounding rect has changed. We do this by calling prepareGeometryChange(). In the case of QWidget, it's sub-optimal that we update its parent, but there's no other way to solve it at the moment.
| | * | | Fix reversed progress bars on VistaJens Bache-Wiig2009-08-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This issue seems to be caused by change a6782030 and was caused by incorrectly applying paranthesis to the expression. Task-number: 259515 Reviewed-by: joao
| | * | | Make QIconloader use resource directory as fallbackJens Bache-Wiig2009-08-114-13/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using different paths on Mac and Windows we now simply use ":\icons" on all platforms. It is a little more effort to create resources but it is certainly the Qt way to do it. :) Reviewed-by: ogoffart