summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixed scaled point drawing with square cap in raster paint engine.Samuel Rødal2010-09-232-24/+39
| | | | | | | | | | | With a large pen width and a small scale, due to the hacky way we draw points (stroking a line from (x, y) to (x + tiny_amount, y)), we some times end up snapping these two points to the same in rasterizeLine(). If we instead apply the SquareCap before we do clipping / snapping we don't get this problem. Task-number: QTBUG-13429 Reviewed-by: Trond
* Don't try to use the texture_from_pixmap extension in GL on desktop/X11.Trond Kjernåsen2010-09-232-29/+7
| | | | | | | | | There are far too many problems with this extension for it to be usable on desktop at the moment, so disable on desktop GL for now. It's still enabled for EGL, where it seems to have better driver support. Task-number: related to QTBUG-11158 Reviewed-by: Samuel
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-2320-148/+526
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Compile on Symbian - rework the X11 mask patch a bit. Fix text direction setting in QTextBlock layout Fix text direction handling in QLabel Fixed QPixmap::resize() for X11 pixmap with masks. QPainter not restored correctly in Graphics View. Setting QGraphicsItem::ItemClipsChildrenToShape forces ItemClipsToShape Fix compilation Fixed drawing of QPixmaps with masks in the GL 2 and X11 engines. Fix warning on MSVC QThread: make sure start works even if called after exit Revert "Fixed painter path drawing on FBO without stencil buffer." Fix a crash with D&d on mingw Revert "Keep other text format with QTextOption::SuppressColors tag on" Fixed stencil buffer on FBOs with OpenGL ES. Keep other text format with QTextOption::SuppressColors tag on QTreeView: do not scroll to top if last item is removed
| * Compile on Symbian - rework the X11 mask patch a bit.Trond Kjernåsen2010-09-236-22/+19
| | | | | | | | | | | | | | | | Avoid adding a virtual QPixmapData::hasMask() function, we can do without it. Made QPixmap::hasAlpha() fast, so we can use that instead. Reviewed-by: Samuel
| * Fix text direction setting in QTextBlock layoutJiang Jiang2010-09-231-6/+0
| | | | | | | | | | | | | | | | QTextControl should no longer inherit the layout direction of parent widget as its default text direction. Reviewed-by: Eskil Abrahamsen Blomfeldt Reviewed-by: Lars Knoll
| * Fix text direction handling in QLabelJiang Jiang2010-09-232-11/+17
| | | | | | | | | | | | | | | | | | For QLabel, text direction should be determined by actual text (if it's a simple text label) or the textDirection() property of the defaultTextOption of corresponding QTextDocument. Task-number: QTBUG-13552 Reviewed-by: Lars Knoll
| * Fixed QPixmap::resize() for X11 pixmap with masks.Trond Kjernåsen2010-09-231-9/+14
| | | | | | | | | | | | | | Regression from 4.6. Made the tst_QPixmap::resizePreserveMask() test fail. Reviewed-by: Samuel
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-2319-117/+493
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QPainter not restored correctly in Graphics View. Setting QGraphicsItem::ItemClipsChildrenToShape forces ItemClipsToShape Fix compilation Fixed drawing of QPixmaps with masks in the GL 2 and X11 engines. Fix warning on MSVC QThread: make sure start works even if called after exit Revert "Fixed painter path drawing on FBO without stencil buffer." Fix a crash with D&d on mingw Revert "Keep other text format with QTextOption::SuppressColors tag on" Fixed stencil buffer on FBOs with OpenGL ES. Keep other text format with QTextOption::SuppressColors tag on QTreeView: do not scroll to top if last item is removed
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-2319-117/+493
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QPainter not restored correctly in Graphics View. Setting QGraphicsItem::ItemClipsChildrenToShape forces ItemClipsToShape Fix compilation Fixed drawing of QPixmaps with masks in the GL 2 and X11 engines. Fix warning on MSVC QThread: make sure start works even if called after exit Revert "Fixed painter path drawing on FBO without stencil buffer." Fix a crash with D&d on mingw Revert "Keep other text format with QTextOption::SuppressColors tag on" Fixed stencil buffer on FBOs with OpenGL ES. Keep other text format with QTextOption::SuppressColors tag on QTreeView: do not scroll to top if last item is removed
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-2219-117/+493
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QPainter not restored correctly in Graphics View. Setting QGraphicsItem::ItemClipsChildrenToShape forces ItemClipsToShape Fix compilation Fixed drawing of QPixmaps with masks in the GL 2 and X11 engines. Fix warning on MSVC QThread: make sure start works even if called after exit Revert "Fixed painter path drawing on FBO without stencil buffer." Fix a crash with D&d on mingw Revert "Keep other text format with QTextOption::SuppressColors tag on" Fixed stencil buffer on FBOs with OpenGL ES. Keep other text format with QTextOption::SuppressColors tag on QTreeView: do not scroll to top if last item is removed
| | | | * QPainter not restored correctly in Graphics View.Bjørn Erik Nilsen2010-09-223-6/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | World transform and opacity was sometimes not restored correctly after drawing items. Auto test included. Task-number: Discovered while working on QTBUG-12760
| | | | * Setting QGraphicsItem::ItemClipsChildrenToShape forces ItemClipsToShapeBjørn Erik Nilsen2010-09-222-45/+267
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem was that setting ItemClipsChildrenToShape on an item resulted in item itself being clipped to its own shape (ItemClipsToShape). This commit also reduces state changes on the painter and re-uses the clip whenever possible, which in turn means better performance for items that clip children to shape. Auto test included. Task-number: QTBUG-12760
| | | | * Fix compilationOlivier Goffart2010-09-221-2/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Kim
| | | | * Fixed drawing of QPixmaps with masks in the GL 2 and X11 engines.Trond Kjernåsen2010-09-226-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A regression from 4.6.x. This is an X11-only problem caused by the separate masks that an X11 QPixmap can contain. These masks we're not taken into account when a number optimizations were done for 4.7. Introduction of the texture-from-pixmap extension in 4.6 also broke masked pixmaps under X11. Task-number: QTBUG-13814 Reviewed-by: Samuel
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-2210-64/+157
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix warning on MSVC QThread: make sure start works even if called after exit Revert "Fixed painter path drawing on FBO without stencil buffer." Fix a crash with D&d on mingw Revert "Keep other text format with QTextOption::SuppressColors tag on" Fixed stencil buffer on FBOs with OpenGL ES. Keep other text format with QTextOption::SuppressColors tag on QTreeView: do not scroll to top if last item is removed
| | | | | * Fix warning on MSVCOlivier Goffart2010-09-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Thierry
| | | | | * QThread: make sure start works even if called after exitOlivier Goffart2010-09-223-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression in 4.7.0 introduced by 13ca61fcfdc53a6a06a Reviewed-by: brad Task-number: QTBUG-13810
| | | | | * Revert "Fixed painter path drawing on FBO without stencil buffer."Kim Motoyoshi Kalland2010-09-222-30/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 89cbb165600de9a557a8a621dc41b93c2a7a2b52. The patch should be applied to Qt 4.8, not 4.7.
| | | | | * Fix a crash with D&d on mingwThierry Bastian2010-09-221-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Drag&Drop callbacks need to be correctly aligned to not crash in the graphics SSE code. Task-number: QTBUG-13787 Reviewed-by: benjamin poulain
| | | | | * Revert "Keep other text format with QTextOption::SuppressColors tag on"Jiang Jiang2010-09-221-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 22ee6863458885c900e8294a44bd782acbdd8201.
| | | | | * Fixed stencil buffer on FBOs with OpenGL ES.Kim Motoyoshi Kalland2010-09-222-27/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If combined depth-stencil buffer is not supported, create separate depth and stencil buffers. Task-number: QTBUG-12861 Reviewed-by: Trond
| | | | | * Keep other text format with QTextOption::SuppressColors tag onJiang Jiang2010-09-221-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting the QTextOption::SuppressColors tag on a QTextDocument breaks all text format, not just colors. This patch fix this by selectively ignoring color properties in the format and keeping other properties. Task-number: QTBUG-13090 Reviewed-by: Eskil
| | | | | * QTreeView: do not scroll to top if last item is removedFrank Reininghaus2010-09-222-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the last item is the current item and is removed, QTreeViewPrivate::updateScrollBars() is called after QTreeViewPrivate's viewItems member is cleared. This commit makes sure that viewItems is restored by calling QTreeView::doItemsLayout() in this case, preventing that the scroll bar range is set to zero temporarily and the view is scrolled to the top unexpectedly (this was a regression in 4.7.0: QTBUG-13567). Merge-request: 2481 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-234-57/+93
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Improved Symbian4 platform detection
| * | | | | Improved Symbian4 platform detectionMiikka Heikkinen2010-09-234-57/+93
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now returns correct value for Symbian4 platforms with QSysInfo::symbianVersion(). SYMBIAN_VERSION .pro file variable should also return correct value even if it doesn't get set in environment.prf. Task-number: QTBUG-13802 Reviewed-by: Shane Kearns Reviewed-by: Janne Anttila
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-2322-180/+112
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Various declarative autotest additions. Update QtDeclarative def files Fix ListModel::set() so the implementation and docs are Improve docs for Qt.quit() Doc fix. Remove unused, unexported class. Remove dead code paths in declarative list model code. Properly cleanup in QDeclarativeModulePlugin test.
| * | | | Various declarative autotest additions.Michael Brasser2010-09-239-1/+96
| | | | |
| * | | | Update QtDeclarative def filesJoona Petrell2010-09-232-3/+7
| | | | |
| * | | | Fix ListModel::set() so the implementation and docs areBea Lam2010-09-232-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | consistent. If index == count() the item should be appended. Also, this should happen regardless of whether the list is empty.
| * | | | Improve docs for Qt.quit()Bea Lam2010-09-231-1/+3
| | | | |
| * | | | Doc fix.Michael Brasser2010-09-231-1/+1
| | | | |
| * | | | Remove unused, unexported class.Michael Brasser2010-09-234-127/+0
| | | | |
| * | | | Remove dead code paths in declarative list model code.Michael Brasser2010-09-234-44/+0
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Bea Lam
| * | | | Properly cleanup in QDeclarativeModulePlugin test.Michael Brasser2010-09-231-0/+1
|/ / / /
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-2316-15/+551
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Move includes after copyright block Mitigate private header problems in QtCreator by adding semi-private API Mitigate private header problems in QtCreator by adding semi-private API Update QtDeclarative def files Add exports for Bauhaus Fix corkboards example for smaller screens Fix easing example having wrong contentHeight Fix a crash in QDeclarativeVisualDataModel Small optimization for QDeclarativeVisualDataModel.
| * | | | Move includes after copyright blockMartin Jones2010-09-221-5/+2
| | | | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-2216-15/+554
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Mitigate private header problems in QtCreator by adding semi-private API Mitigate private header problems in QtCreator by adding semi-private API Update QtDeclarative def files Add exports for Bauhaus Fix corkboards example for smaller screens Fix easing example having wrong contentHeight Fix a crash in QDeclarativeVisualDataModel Small optimization for QDeclarativeVisualDataModel.
| | * | | Mitigate private header problems in QtCreator by adding semi-private APIKai Koehne2010-09-224-0/+187
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a semi-private API to get QScriptEngine for a QDeclarativeEngine. So far the qmljsdebugger lib in QtCreator accessed the script engine via QDeclarativeEnginePrivate. Replace this by a minimal API that is still in a private header, where we nevertheless can make some BC checks/guarantees. Aaron Kennedy agreed with the idea. Task-number: QTCREATORBUG-2179
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-2216-15/+367
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Mitigate private header problems in QtCreator by adding semi-private API Update QtDeclarative def files Add exports for Bauhaus Fix corkboards example for smaller screens Fix easing example having wrong contentHeight Fix a crash in QDeclarativeVisualDataModel Small optimization for QDeclarativeVisualDataModel.
| | | * | Mitigate private header problems in QtCreator by adding semi-private APIKai Koehne2010-09-227-3/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a semi-private API to get QScriptEngine for a QDeclarativeEngine. So far the qmljsdebugger lib in QtCreator accessed the script engine via QDeclarativeEnginePrivate. Replace this by a minimal API that is still in a private header, where we nevertheless can make some BC checks/guarantees. Aaron Kennedy agreed with the idea. Task-number: QTCREATORBUG-2179
| | | * | Update QtDeclarative def filesJoona Petrell2010-09-222-0/+167
| | | | |
| | | * | Add exports for BauhausThomas Hartmann2010-09-212-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QmlDesigner(Bauhaus) should not rely on -nokia-developer Reviewed-by: Marco Bubke
| | | * | Fix corkboards example for smaller screensJoona Petrell2010-09-211-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: Reviewed-by: Martin Jones
| | | * | Fix easing example having wrong contentHeightJoona Petrell2010-09-211-1/+1
| | | | |
| | | * | Fix a crash in QDeclarativeVisualDataModelJoona Petrell2010-09-213-3/+44
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13754 Reviewed-by: Martin Jones
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-211-2/+2
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Small optimization for QDeclarativeVisualDataModel.
| | | | * | Small optimization for QDeclarativeVisualDataModel.Michael Brasser2010-09-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Martin Jones
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-221-10/+9
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Qmake: Fix wrong path in the breakpad post link step
| * | | | | Qmake: Fix wrong path in the breakpad post link stepMarco Bubke2010-09-221-10/+9
|/ / / / / | | | | | | | | | | | | | | | Reviewed-By: Oswald Buddenhagen
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-227-58/+76
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: We also don't need to watch for org.freedesktop.DBus changing owners Avoid adding match rules for NameAcquired and NameLost We don't need to add a match rule to receive messages targetted at us. Save the D-Bus's base service earlier. Pre-populate the watched services hash with org.freedesktop.DBus Quick performance optimisation: cache a QString with "org.freedesktop.DBus" XML schema internals: fix memory leak QNAM: Use QFileNetworkReply for qrc:/ URL schema Make the de-inlined isRightToLeft not get called from updateProperties Update the ICC mkspec: keep the stack aligned to 16-byte
generated by cgit v0.12 at 2025-03-18 02:37:52 (GMT)