summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-19209-10339/+47199
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (126 commits) Skip OpenGL threading tests on Mac as they were causing reboots Fixed compile of autotests. Fix warnings on gcc Add experimental VBO support for drawCachedGlyphs()'s index array Fix threaded gl autotest build failure on GLES2 Removed redundant debug output from trace benchmark. Added two QML based traces to trace benchmark. Fixed old trace files no longer working. Reduced the memory footprint of qttrace files. Added trace replayer benchmark. Added --range and --single arguments to qttracereplay. Always accept values reported directly using QTest::setBenchmarkResult. Make threading use-cases work for X11 Run firstRun initialization in declarative/painting benchmark Optimization for text drawing on OpenGL Enable QStaticText in QtDeclarative painting benchmark Fix no-webkit compiler helpviewer Make sure height of glyph cache is a power of two Fixes crash when destroying a QGraphicsItem. Move benchmarks/qvector to benchmarks/corelib/tools/qvector ...
| * Skip OpenGL threading tests on Mac as they were causing rebootsTom Cooksey2010-02-191-0/+12
| | | | | | | | Reviewed-By: TrustMe
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-19209-10339/+47187
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (125 commits) Fixed compile of autotests. Fix warnings on gcc Add experimental VBO support for drawCachedGlyphs()'s index array Fix threaded gl autotest build failure on GLES2 Removed redundant debug output from trace benchmark. Added two QML based traces to trace benchmark. Fixed old trace files no longer working. Reduced the memory footprint of qttrace files. Added trace replayer benchmark. Added --range and --single arguments to qttracereplay. Always accept values reported directly using QTest::setBenchmarkResult. Make threading use-cases work for X11 Run firstRun initialization in declarative/painting benchmark Optimization for text drawing on OpenGL Enable QStaticText in QtDeclarative painting benchmark Fix no-webkit compiler helpviewer Make sure height of glyph cache is a power of two Fixes crash when destroying a QGraphicsItem. Move benchmarks/qvector to benchmarks/corelib/tools/qvector Some threading improvements to the GL module ...
| | * Fixed compile of autotests.Rohan McGovern2010-02-182-3/+1
| | | | | | | | | | | | | | | Rename tst_openglthreading.pro to qgl_threads.pro: .pro file name must match directory name for SUBDIRS project to work.
| | * Merge remote branch 'qt/master' into staging-2-masterQt Continuous Integration System2010-02-18644-1954/+13821
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/assistant/tools/assistant/helpviewer_qtb.h tools/assistant/tools/assistant/helpviewer_qwv.cpp tools/assistant/tools/assistant/helpviewer_qwv.h
| | * | Fix warnings on gccEskil Abrahamsen Blomfeldt2010-02-183-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | Gcc warns if declaration and initialization order are different. Reviewed-by: Samuel
| | * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2Eskil Abrahamsen Blomfeldt2010-02-1817-50/+522
| | |\ \
| | | * | Fix threaded gl autotest build failure on GLES2Tom Cooksey2010-02-182-13/+20
| | | | | | | | | | | | | | | | | | | | Reviewed-By: Gunnar
| | | * | Removed redundant debug output from trace benchmark.Samuel Rødal2010-02-181-1/+0
| | | | |
| | | * | Added two QML based traces to trace benchmark.Samuel Rødal2010-02-184-0/+4
| | | | |
| | | * | Fixed old trace files no longer working.Samuel Rødal2010-02-181-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move new static text draw command to the end to avoid invalidating existing traces. Reviewed-by: Eskil
| | | * | Reduced the memory footprint of qttrace files.Samuel Rødal2010-02-185-15/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A couple of improvements have been made: * Use single precision floats for the traces. * Reduce the number of variant wrapped transforms by introducing a new translate command. * Reduce the number of bytes streamed per image / pixmap draw command. * Add versioning info to qttrace files to be more future proof. Reviewed-by: Gunnar Sletta
| | | * | Added trace replayer benchmark.Samuel Rødal2010-02-188-1/+275
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now we can easily add trace files generated with -graphicssystem trace for benchmarking on all relevant platforms. Reviewed-by: Gunnar Sletta
| | | * | Added --range and --single arguments to qttracereplay.Samuel Rødal2010-02-181-9/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes it easy to split a large trace into several sub-traces by running the qttracereplay with -graphicssystem trace. Reviewed-by: Gunnar Sletta
| | | * | Always accept values reported directly using QTest::setBenchmarkResult.Samuel Rødal2010-02-181-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: jasplin
| | | * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2Gunnar Sletta2010-02-1815-33/+110
| | | |\ \
| | | * | | Make threading use-cases work for X11Gunnar Sletta2010-02-181-12/+28
| | | | | |
| | * | | | Add experimental VBO support for drawCachedGlyphs()'s index arrayEskil Abrahamsen Blomfeldt2010-02-182-1/+32
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code is disabled by default, but included for testing on different platforms. Intuition implies that caching the index array in a VBO should be a performance improvement, but so far our tests do not confirm this. Reviewed-by: Gunnar
| | * | | Run firstRun initialization in declarative/painting benchmarkEskil Abrahamsen Blomfeldt2010-02-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The firstRun block of the paint event would never be executed because of a typo in the condition. Reviewed-by: TrustMe
| | * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2Eskil Abrahamsen Blomfeldt2010-02-185-19/+21
| | |\ \ \
| | | * | | Enable QStaticText in QtDeclarative painting benchmarkRhys Weatherley2010-02-171-9/+5
| | | | | |
| | | * | | Fix no-webkit compiler helpviewerRhys Weatherley2010-02-174-10/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QT_NO_WEBKIT is not defined until qglobal.h has been included. Reviewed-by: Daniel Pope
| | * | | | Optimization for text drawing on OpenGLEskil Abrahamsen Blomfeldt2010-02-182-2/+8
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only call glBindTexture() if the glyph cache texture is not already bound. This can potentially give performance improvement of around 30%. Reviewed-by: Gunnar
| | * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2Eskil Abrahamsen Blomfeldt2010-02-1778-481/+1416
| | |\ \ \
| | | * | | Fixes crash when destroying a QGraphicsItem.Yoann Lopes2010-02-172-2/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When clearing the focus on an item, the focus was previously passed to the closest parent focus scope (if any). But the focus should go to the closest parent focus scope only if the item being cleared of the focus is itself a focus scope. This incorrect behavior leaded to invalid pointers in QGraphicsItem under specific circumstances, eventually leading to a crash when destroying the item. Auto-test included. Task-number: QT-2649 Reviewed-by: Andreas Aardal Hanssen
| | | * | | Move benchmarks/qvector to benchmarks/corelib/tools/qvectorBjørn Erik Nilsen2010-02-175-1/+2
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | Left-over after: 020830966e08239854ac207ec28663a80c6e0647. This change was done in the 4.6 branch, however the qvector bench didn't exists in the 4.6 branch.
| | | * | Some threading improvements to the GL moduleGunnar Sletta2010-02-177-18/+575
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Make bindTexture threadsafe - Document which areas of QGLWidget needs locking in order to do out-of-gui thread rendering - Testcases to prove that these cases work Reviewed-by: Trond
| | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-17178-10269/+45987
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (105 commits) Fixed compile on Mac. Changelog update for 4.7. Fix license headers. Rename QStaticText::setUseBackendOptimizations to setPerformanceHint() doc: Update documentation for QStaticText Fixed a compile error on Mac/Leopard. Fix alpha check for OpenGL/ES in GL2 paint engine Compile fix for QStaticText - include declaration of QColor Support Qt::AutoTest in QStaticText::setTextFormat() Improved performance of path vs path intersection where one is a rect. Separate out textFormat property from setText() function and remove Update license doc and .pri file for libpng 1.4.0 Our modifications to libpng Add libpng 1.4.0 Delete libpng 1.2.40 Fixes a behaviour for QDockWidget used without QMainWindow Replaced the numCopies()/setNumCopies() and actualNumCopies() API. Add API for rich text and getting actual size of QStaticText Remove fluxuating tests for QStaticText Make QStaticText public API again ...
| | | | * | Fixed compile on Mac.Kim Motoyoshi Kalland2010-02-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Prasanth
| | | | * | Changelog update for 4.7.Trond Kjernåsen2010-02-161-1/+5
| | | | | |
| | | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2Jason McDonald2010-02-164-44/+84
| | | | |\ \
| | | | * | | Fix license headers.Jason McDonald2010-02-164-70/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | | | Make sure height of glyph cache is a power of twoEskil Abrahamsen Blomfeldt2010-02-171-8/+18
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Making the size of the glyph cache a power of two can potentially have performance benefits on hardware accelerated graphics systems. Since it will also decrease the number of times the cache has to be copied, and therefore implies a speed-up for all paint engines, it has been implemented for all of them in general. Reviewed-by: Gunnar
| | * | | | Rename QStaticText::setUseBackendOptimizations to setPerformanceHint()Eskil Abrahamsen Blomfeldt2010-02-163-32/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the API more general and more readable by using a PerformanceHint enum instead of an on/off-trigger for the OpenGL-specific caching. Reviewed-by: Samuel
| | * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2Eskil Abrahamsen Blomfeldt2010-02-161-1/+1
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Fixed a compile error on Mac/Leopard.Trond Kjernåsen2010-02-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Carlos Duclos
| | * | | | doc: Update documentation for QStaticTextEskil Abrahamsen Blomfeldt2010-02-162-12/+39
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make some smaller modifications, fixes and additions. Remove \internal because the API is public now, and add documentation for QPainter::drawStaticText() since this was missing. Reviewed-by: TrustMe
| | * | | Fix alpha check for OpenGL/ES in GL2 paint engineRhys Weatherley2010-02-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GL_RGB5 and GL_RGB8 don't exist on OpenGL/ES systems. Reviewed-by: Julian de Bhal
| | * | | Compile fix for QStaticText - include declaration of QColorRhys Weatherley2010-02-151-0/+1
| | | | |
| | * | | Merge remote branch 'qt/master' into staging-2-masterQt Continuous Integration System2010-02-152718-3250/+320991
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qlineedit/tst_qlineedit.cpp
| | * | | | Support Qt::AutoTest in QStaticText::setTextFormat()Eskil Abrahamsen Blomfeldt2010-02-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | The bit field has to be unsigned to support values of 2 (and higher.)
| | * | | | Merge branch 'qt-graphics-team-qstatictext-4.7'Eskil Abrahamsen Blomfeldt2010-02-15351-4172/+3881
| | |\ \ \ \
| | | * \ \ \ Merge branch 'qstatictext-4.7' of ↵Eskil Abrahamsen Blomfeldt2010-02-15680-25919/+43818
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/qt-graphics-team into qstatictext-4.7
| | | | * \ \ \ Merge branch 'master' of scm.dev.troll.no:qt/oslo-staging-2 into qstatictext-4.7Eskil Abrahamsen Blomfeldt2010-02-15680-25919/+43818
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tests/auto/qlineedit/tst_qlineedit.cpp Merge branch 'master' of scm.dev.troll.no:qt/oslo-staging-2 into qstatictext-4.7 Conflicts: src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tests/auto/qlineedit/tst_qlineedit.cpp Merge branch 'master' of scm.dev.troll.no:qt/oslo-staging-2 into qstatictext-4.7 Conflicts: src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tests/auto/qlineedit/tst_qlineedit.cpp
| | | * | | | | | Separate out textFormat property from setText() function and removeEskil Abrahamsen Blomfeldt2010-02-154-25/+41
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | isEmpty() function in QStaticText To make the return value of text() more intuitively clearer, and to make the API more readable, I've separated out the text format into a separate property. The isEmpty() function seemed out-of-place in the API, as suggested by reviews, so it has been removed.
| | | * | | | | Add API for rich text and getting actual size of QStaticTextEskil Abrahamsen Blomfeldt2010-02-144-31/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Required for several use cases, support for some html tags to change font, color and do advanced text layouts, as well as getting the bounds of the text when drawn.
| | | * | | | | Remove fluxuating tests for QStaticTextEskil Abrahamsen Blomfeldt2010-02-101-209/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QGLWidget tests would fail at random. The use case has been confirmed to work through manual tests, but I haven't found any good way to test them automatically. They have been removed until time permits.
| | | * | | | | Make QStaticText public API againEskil Abrahamsen Blomfeldt2010-02-1014-254/+253
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QStaticText was previously made private API to support inclusion in Qt 4.6.x. This change turns it back into public API for Qt 4.7.0.
| | | * | | | | Revert 004b09ffd423cd3100e346825dd7d730fc86d366Eskil Abrahamsen Blomfeldt2010-02-101-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing the height here will make the coords out of sync with the ' buffer, causing broken drawing. I revert this change to prepare QStaticText for integration, and will revisit it later on.
| | | * | | | | Merge branch 'qstatictext-4.6' of ↵Eskil Abrahamsen Blomfeldt2010-02-101-1/+5
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/qt-graphics-team into qstatictext-4.6
generated by cgit v0.12 at 2025-08-19 07:27:38 (GMT)