summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* More work on GL threading.Trond Kjernåsen2010-07-026-36/+98
| | | | | | | | | | Removed QObject inheritance from QGLEngineSharedShaders and made it thread-local, so that paintengines in different threads can use programs without clashing. Lifted some restrictions on QPixmap so that they may be used in threads when the GL2 engine is active. Made the QGLContextGroup a part of the pixmap and image cache keys.
* Make qt_gl_paint_engine() thread-safe.Trond Kjernåsen2010-07-021-7/+36
|
* Fixed the combobox just adjusting their size without relayoutingThierry Bastian2010-07-011-0/+1
| | | | | | | When adjustSize() is called, we nned to call updateGeometry to notify the layout in which the combobox is to redo the layout. Task-number: QTBUG-2559
* Auto expand of QTreeWidget does not work correctly if animatedThierry Bastian2010-07-013-5/+7
| | | | | | | The problem was that the internal state of the tree was not correctly reset. Patch comes from the task. Task-number: QTBUG-10850
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-301-48/+0
|\ | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QMutex: remove debug warnings.
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-301-48/+0
| |\ | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QMutex: remove debug warnings.
| | * QMutex: remove debug warnings.Olivier Goffart2010-06-301-48/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d->owner is not tracked correctly when the new inline (un)lock function are called. And there is no way to make it work reliably as one could mix application compiled in release with Qt in debug. So QMutex could display lots of false warnings. Better to remove them. Reviewed-by: Trond
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-303-18/+7
|\ \ \ | |/ / |/| | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix the blank areas during resize with the
| * | Fix the blank areas during resize with theFabien Freling2010-06-303-18/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | raster engine on Mac OS X. This is mainly done by reverting the commit 04e34fe3aecca482abeeabe2e31778e9102eeb08 Task-number: QTBUG-11518 Reviewed-by: Samuel
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-301-1/+1
|\ \ \ | |/ / | | / | |/ |/| | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix regression in popup behavior on Windows
| * Fix regression in popup behavior on WindowsJens Bache-Wiig2010-06-091-1/+1
|/ | | | | | | | | | | Popups without a parent would unintentionally deactivate their parents following af7d2b2127d. In order to avoid this, we do not activate popups when there is an active application window. System tray popups are still activated. Reviewed-by: denis Task-number: QTBUG-11061
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-301-1/+2
|\ | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix QDir::tempPath() documentation for Unix
| * Merge commit 'refs/merge-requests/704' of git://gitorious.org/qt/qt into ↵David Boddie2010-06-281-1/+2
| |\ | | | | | | | | | integration
| | * Fix QDir::tempPath() documentation for UnixJan Arne Petersen2010-06-241-1/+2
| | | | | | | | | | | | | | | | | | | | | Mention TMPDIR environment variable for Linux/Unix case and clarify documentation. Fixes: QTBUG-11496
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-308-138/+147
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Code simplification in treeviews Oops... Fixed the itemviews so that the editor is not considered opaque any more minor documentation improvements nano optimizations fix possible crash in nextCursorPosition()/previousCursorPosition() add some QTextLayout subtests set currentIndex as USER property for QComboBox
| * | Code simplification in treeviewsThierry Bastian2010-06-301-3/+1
| | |
| * | Oops...Thierry Bastian2010-06-291-1/+1
| | |
| * | Fixed the itemviews so that the editor is not considered opaque any moreThierry Bastian2010-06-293-26/+3
| | | | | | | | | | | | | | | | | | | | | The editor was always considered opaque and clipping was set on the painter. This assumption can't be verified. Task-number: QTBUG-11367
| * | minor documentation improvementsRitt Konstantin2010-06-281-85/+94
| | | | | | | | | | | | | | | Merge-request: 685 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
| * | nano optimizationsRitt Konstantin2010-06-282-9/+11
| | | | | | | | | | | | | | | Merge-request: 685 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
| * | fix possible crash in nextCursorPosition()/previousCursorPosition()Ritt Konstantin2010-06-281-13/+12
| | | | | | | | | | | | | | | | | | | | | due to boundary overflow when called for invalid cursor position Merge-request: 685 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
| * | add some QTextLayout subtestsRitt Konstantin2010-06-281-0/+24
| | | | | | | | | | | | | | | Merge-request: 685 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
| * | set currentIndex as USER property for QComboBoxThierry Bastian2010-06-281-1/+1
| | | | | | | | | | | | Task-Number: QTBUG-5260
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-281-39/+15
|\ \ \ | |/ / | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Makes the splascreen transparent depending on the pixmap
| * | Makes the splascreen transparent depending on the pixmapThierry Bastian2010-06-281-39/+15
|/ / | | | | | | Task-Number: QTBUG-3887
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-285-6/+8
|\ \ | |/ |/| | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix suspicious code found by static code analysis:
| * Fix suspicious code found by static code analysis:Zachary Blair2010-06-275-6/+8
|/ | | | | | | | | * Missing break in switch * delete instead of delete[] * Null-pointer check after dereference Merge-request: 716 Reviewed-by: Andreas Kling <andreas.kling@nokia.com>
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-243-8/+9
|\ | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Enablers for external use of QGLTextureGlyphCache Fix painting of overlines in labels.
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-243-8/+9
| |\ |/ / | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Enablers for external use of QGLTextureGlyphCache Fix painting of overlines in labels.
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-233-8/+9
| |\ |/ / | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Enablers for external use of QGLTextureGlyphCache Fix painting of overlines in labels.
| * Enablers for external use of QGLTextureGlyphCacheEskil Abrahamsen Blomfeldt2010-06-232-7/+8
| | | | | | | | | | | | | | | | | | | | In order to enable use of QGLTextureGlyphCache outside of Qt, it can't depend on having an initialized paint engine. We use the simple image fallback for copying the cache texture when it's updated and we need to export the functions for resolving extensions, so that the gl context can be initialized properly without calling begin on a paint engine. Reviewed-by: Kim
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-231-1/+1
| |\ |/ / | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix painting of overlines in labels.
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2Gunnar Sletta2010-06-2313-37/+628
| |\
| * | Fix painting of overlines in labels.Gunnar Sletta2010-06-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the size of the widget is an odd number, the layout rect will be positioned at a 0.5 offset. The clipping set further below will snap this to 1 and thus clip away the anything drawn on the first row of pixels. Fix this by aligning the rectangle we get by layout rect. Reviewed-by: Eskil Task: http://bugreports.qt.nokia.com/browse/QTBUG-9684
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-213-11/+67
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: code style changes applied to MR 697 QElapsedTimer/Win: use QueryPerformanceCounter if available
| * | | code style changes applied to MR 697Joerg Bornemann2010-06-211-4/+3
| | | |
| * | | QElapsedTimer/Win: use QueryPerformanceCounter if availableSebastian Hartte2010-06-213-11/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a clock type to reflect this. Merge-request: 697 Reviewed-by: joerg Reviewed-by: thiago
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-217-27/+114
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Refactor QTextureGlyphCache
| * | | Refactor QTextureGlyphCacheEskil Abrahamsen Blomfeldt2010-06-217-27/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Separate getting the glyph coordinates from actually making and populating the cache. Calling populate() and fillInPendingGlyphs() immediately after should be equivalent to the old code, except it might have fewer reallocations of the texture since you will only create it one per set of glyphs. This mainly enables populating the GL glyph cache outside a GL context and then actually drawing into it later, when the context has actually been established. Reviewed-by: Kim
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-185-9/+513
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Make QObject::connect with QMetaMethod works with Jambi Added QObject::connect overload taking QMetaMethod as parameter
| * | | Make QObject::connect with QMetaMethod works with JambiOlivier Goffart2010-06-181-16/+42
| | | | | | | | | | | | | | | | | | | | We need to call QInternal::activateCallbacks to the recently added overload of QObject::connect
| * | | Added QObject::connect overload taking QMetaMethod as parameterSergey Vidyuk2010-06-185-9/+487
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added QObject::connect() and QObject::disconnect() functions implementations which use QMetaMethod to specify signals and slots to be connected or disconnected. Merge-request: 636 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com> Task-number: QTBUG-10637
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-1847-282/+1619
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix compiler warning qdrawhelper: Use SSE2 in fetchTransformedBilinear (when scalling up) QListView: speedup QListView::setRowHidden() Remove debug info from tst_QGlyphs Fix tst_QGlyphs to pass on Windows XP Finally, remove some trailing whitespace. Fix warning with gcc in -pedantic Make tst_image a little bit more tollerent to rounding errors Fix compilation with RVCT Test native graphics engine in tst_QGlyphs Remove unused function in tst_QGlyphs qdrawhelper: optimize fetchTransformedBilinear qdrawhelper: remove code duplication Fix maketestselftest by adding the qglyphs test add missing header make the plugin loader autotests pass Reimplement more of QAbstractItemModel in QAbstractProxyModel Qt now really unloads plugins and libraries when exiting an app Don't add the qmediaplayer.pro to the destination path of the sources. New class: QGlyphs
| * | | Fix compiler warningOlivier Goffart2010-06-181-1/+1
| | |/ | |/|
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-1646-281/+1618
| |\ \ |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: qdrawhelper: Use SSE2 in fetchTransformedBilinear (when scalling up) QListView: speedup QListView::setRowHidden() Remove debug info from tst_QGlyphs Fix tst_QGlyphs to pass on Windows XP Finally, remove some trailing whitespace. Fix warning with gcc in -pedantic Make tst_image a little bit more tollerent to rounding errors Fix compilation with RVCT Test native graphics engine in tst_QGlyphs Remove unused function in tst_QGlyphs qdrawhelper: optimize fetchTransformedBilinear qdrawhelper: remove code duplication Fix maketestselftest by adding the qglyphs test add missing header make the plugin loader autotests pass Reimplement more of QAbstractItemModel in QAbstractProxyModel Qt now really unloads plugins and libraries when exiting an app Don't add the qmediaplayer.pro to the destination path of the sources. New class: QGlyphs
| * | qdrawhelper: Use SSE2 in fetchTransformedBilinear (when scalling up)Olivier Goffart2010-06-161-14/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is possible to use SSE2 to speedup the smooth scaling of a pixmap Benchmark results: Drawing the home screen of Qt Creator: Qt 4.7: 45fps After last set of patches: 75fps After this patch: 95fps Reviewed-by: Samuel
| * | QListView: speedup QListView::setRowHidden()Olivier Goffart2010-06-162-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | Basically the same optimisation that had been made long ago in the tree view: Use the right data structure for QListViewPrivate::hiddenRows (QSet instead of QVector) Task-number: QTBUG-11438 Reviewed-by: Gabriel
| * | Merge remote branch 'origin/master'Olivier Goffart2010-06-15375-9110/+25591
| |\ \ | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qpainter.cpp
| * | | Remove debug info from tst_QGlyphsEskil Abrahamsen Blomfeldt2010-06-151-1/+1
| | | | | | | | | | | | | | | | Mistakenly added in 171ad741fda84384a64ce56c847de7667051914c.
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2Eskil Abrahamsen Blomfeldt2010-06-1514-47/+60
| |\ \ \
generated by cgit v0.12 at 2025-09-13 05:33:32 (GMT)