summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* QNAM: Enhance the zerocopy download buffer benchmarkMarkus Goetz2010-09-291-13/+30
| | | | | | | Measure the variant too where a download buffer was requested but the read() functions are then used. Reviewed-by: TrustMe
* QNAM: More zerocopy changesMarkus Goetz2010-09-292-6/+179
| | | | | | | | | | | | | The zerocopy download buffer is now QSharedPointer<char> instead of the QSharedPointer to QVarLengthArray<char>. This will be a bit leaner to handle by QML and QtWebKit and does not tie us to a QVLA that much. Also fix some bugs related to signal emissions and the return value of bytesAvailable(). Now the behaviour should be the same if a zerocopy buffer is used or not. Reviewed-by: Peter Hartmann Reviewed-by: Thiago Macieira
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-281-0/+2
|\ | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix tst_qsorftfilterproxymodel after 893cd4dd6eb64 An an assert when a QModelIndex from the wrong model is used with QSFPM.
| * Fix tst_qsorftfilterproxymodel after 893cd4dd6eb64Olivier Goffart2010-09-281-0/+2
| |
* | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2010-09-2831-9/+812
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (83 commits) Add export to QDeclarativeBasePositioner Fix assert when placing a .qml file inside $QTDIR/imports Moved the partial deployment section to qbase.pri. Made the Symbian menu close when switching native focus. Document PropertyAnimation::targets property Fix test. QHostInfo: Fix a crash when a new request is pushed while resolving. Updated WebKit to 6e15c3404d15a8ab72242152ec966e5e388161a2 Fix a compilation issue of tst_qsettings for win32-msvc. fix RSS listing example QML Debugging: Documentation fixes dist/changes: QML Debugging changes Updated changes-4.7.1. Do not set DESTDIR to the current directory Small fixes to Browser.qml Fix dependency on the plugins rule for multimedia More declarative autotests. Fix example. Assistant: Don't register internal doc when using custom collection. Assistant: Move comment to the right place. ...
| * Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-2831-9/+812
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qrasterizer.cpp src/network/access/qnetworkaccessmanager.cpp tests/auto/qpainter/tst_qpainter.cpp tools/assistant/tools/assistant/mainwindow.cpp
| | * Made the Symbian menu close when switching native focus.axis2010-09-271-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | This was required to avoid windows appearing on top of the popup menu, preventing both the menu and the softkeys from being used. Task: QTBUG-9965 AutoTest: Included RevBy: Jason Barron
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-269-1/+109
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Small fixes to Browser.qml More declarative autotests. Fix example.
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-249-1/+109
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Small fixes to Browser.qml More declarative autotests. Fix example.
| | | | * More declarative autotests.Michael Brasser2010-09-249-1/+109
| | | | |
| | * | | Fix a compilation issue of tst_qsettings for win32-msvc.Liang Qi2010-09-241-0/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | Need to include advapi32 for seperate usage of registry functions. Reviewed-by: Marius Storm-Olsen
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-241-1/+22
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed floating point overflow issues in QRasterizer::rasterizeLine Fixed scaled point drawing with square cap in raster paint engine. Don't try to use the texture_from_pixmap extension in GL on desktop/X11.
| | | * | Fixed floating point overflow issues in QRasterizer::rasterizeLineSamuel Rødal2010-09-231-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change 7c673a4cf64ba04 introduced some autotest failures in the fpe_steepSlopes test in QPainter. Since the other rasterizers all deal in a 26.6 fixed point coordinate space we should snap the line vertices to this to prevent floating point overflows due to very steep slopes. This also necessitates keeping track of four different slope / inverse slope increments for each of the four edges. This also fixes a previously QEXPECT_FAIL'ed test case. Task-number: QTBUG-13429 Reviewed-by: Trond
| | | * | Fixed scaled point drawing with square cap in raster paint engine.Samuel Rødal2010-09-231-0/+22
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-242-1/+28
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Disallow patching capabilities of executables Made it more clear what the okToRun function does by renaming it. Fixed event starvation on Symbian if timers were constantly recreated Fixed deployment when using shadow builds. Marked a test as XFAIL on Symbian. Made posted events part of the round robin queue. Avoid OpenVG rendering errors when stroking an aliased path.
| | | * Merge branch 'eventStarvationFixes' into 4.7-s60axis2010-09-232-1/+28
| | | |\
| | | | * Fixed event starvation on Symbian if timers were constantly recreatedaxis2010-09-231-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a timer event occurred, and inside its handler a new timer was created that would also immediately occur, the events would execute over and over and starve other events. This happened because the code in Symbian that is supposed to detect when the same event happens more than once does not work if it is always a new timer which executes. The bug was fixed by introducing a state variable which signals whether we are currently inside the handler of a timer event, and then pretending that newly created timers inside this handler have already been executed once, thereby delaying their execution until the next iteration. Because we reset the state variable in processEvents, the behavior will be slightly different if run directly under CActiveScheduler::Start(). There, we have no way of resetting the state on the next iteration, so all timers inside such a handler (even if it recurses into a new CActiveScheduler::Start()) will be delayed by one event iteration. However, this is considered acceptable, since there is no real "iteration count" in the active scheduler; the event will simply be run after the deferred queue is reactivated (which will be immediately if there are no other events). This is the same as what would have happened for a real timer that executed once and then recursed into CActiveScheduler::Start() (it would also be delayed by one iteration). Task: QTBUG-13773 RevBy: mread AutoTest: Passed
| | | | * Fixed deployment when using shadow builds.axis2010-09-231-1/+1
| | | | |
| | | | * Marked a test as XFAIL on Symbian.axis2010-09-231-0/+4
| | | | | | | | | | | | | | | | | | | | Task: QTBUG-13773
| | | | * Made posted events part of the round robin queue.axis2010-09-231-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That means that posted events will only be sent once per event queue iteration, just like timers. This helps prevent event starvation. RevBy: mread AutoTest: Included Task: QTBUG-13743
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-234-5/+294
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-234-5/+294
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-221-5/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-221-0/+188
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-222-0/+63
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | * | QThread: make sure start works even if called after exitOlivier Goffart2010-09-221-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression in 4.7.0 introduced by 13ca61fcfdc53a6a06a Reviewed-by: brad Task-number: QTBUG-13810
| | | | | * | QTreeView: do not scroll to top if last item is removedFrank Reininghaus2010-09-221-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | | | | Various declarative autotest additions.Michael Brasser2010-09-238-0/+95
| | | | | | |
| | * | | | | Fix ListModel::set() so the implementation and docs areBea Lam2010-09-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | consistent. If index == count() the item should be appended. Also, this should happen regardless of whether the list is empty.
| | * | | | | Properly cleanup in QDeclarativeModulePlugin test.Michael Brasser2010-09-231-0/+1
| | |/ / / /
| | * | | | Mitigate private header problems in QtCreator by adding semi-private APIKai Koehne2010-09-222-0/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-225-0/+139
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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-223-0/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | | Fix a crash in QDeclarativeVisualDataModelJoona Petrell2010-09-212-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13754 Reviewed-by: Martin Jones
* | | | | | Fix a color propagation issue with Combobox line editJens Bache-Wiig2010-09-281-0/+12
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some pixmap based themes were affected by this issue since they needed to resolve the palette against the widget and the lineedit palette was already resolved. We now set the palette on the lineedit when you modify the parent palette. You can still maintain a separate palette on the lineedit, but you have to set it after the parent has been set. We can remove some workarounds for plastique and vista style due to this. Task-number: QTBUG-5950 Reviewed-by: ogoffart
* | | | | Fix QPainter::clipBoundingRect() for QRectF clip.Andreas Kling2010-09-261-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clipBoundingRect() wasn't handling QPainterClipInfo::RectFClip properly, mistaking it for PathClip. Reviewed-by: Samuel Rødal
* | | | | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2010-09-222-2/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (131 commits) Fix audio glitches in the audiooutput example. apply msvc flags to wince too fix qt static build on wince fix build with QT_NO_GESTURES Fixed drawing a large number of glyphs with the same font under GL. qmake: fix quoting of moc calls Bump version to 4.7.1. Improved output of patch_capabilities.pl script Qt headers must be included before X11 headers Fixes bezier curves not being drawn when it is a line. Button remains pressed if release event happens outside of widget Avoid creating copy of an image in memory when storing as jpeg Use regparm(3) for ICC too, otherwise it's an ABI mismatch in QChar Regenerate the Unicode tables after updates to the generator tool Compile in C++0x mode remove extra includes minor clean-ups minor improvements for data parsers tiny clean-up for generated data move QUnicodeTables:: script() and lineBreakClass() implementations ...
| * \ \ \ \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-222-2/+8
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qtextureglyphcache_p.h src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-222-2/+8
| | |\ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: apply msvc flags to wince too fix qt static build on wince fix build with QT_NO_GESTURES qmake: fix quoting of moc calls Use regparm(3) for ICC too, otherwise it's an ABI mismatch in QChar Regenerate the Unicode tables after updates to the generator tool Compile in C++0x mode remove extra includes minor clean-ups minor improvements for data parsers tiny clean-up for generated data move QUnicodeTables:: script() and lineBreakClass() implementations make lupdate test less fragile Enable building Qt/Webkit with debug symbols Add breakpad support
| | | * | | make lupdate test less fragileOswald Buddenhagen2010-09-212-2/+8
| | | |/ / | | | | | | | | | | | | | | | | | | | | the sensivity to additions of new calls to unimplemented qmake functions to .prf files kinda sucks, so remove it.
| | * | | Bump version to 4.7.1.Jason McDonald2010-09-215-5/+5
| | |/ / | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-222-2/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix C++0x initializer lists tests. Keep other text format with QTextOption::SuppressColors tag on
| * | | Fix C++0x initializer lists tests.Olivier Goffart2010-09-222-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | It was using the wrong macro Reviewed-by: Thierry
* | | | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2010-09-2247-168/+1282
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (231 commits) Fixed compile warning on Windows. Fixed painter path drawing on FBO without stencil buffer. qmake: Make smart library merge architecture-aware Slovenian translation: some updates and fixes Fixed memory leak in Symbian when Options menu was launched. Fixed color of cosmetic pens when printing under Windows. Fixed infinite loop when loading jpeg without EOI from memory. Fixes QPen dash offset for OpenGL paint engines (1.x & 2.x). Added galician translation Support multisampled pbuffers under Windows. tst_qpixmapfilter: Fix compilation in namespace qtextcodec_symbian: Add few aliases Give a warning in QPixmap::handle() if pixmap is not X11 class. Make QStaticText honor QPainter::pen() for rich text on X11 w/raster Fix one hang of QNAM on Symbian. Update QtDeclarative def files Update QtGui def files Update QtCore bwins def file Fix Symbian def file for a9e5329168 Make build on Symbian ...
| * | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-2147-168/+1282
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.h src/declarative/graphicsitems/qdeclarativeflickable.cpp src/declarative/graphicsitems/qdeclarativeflickable_p_p.h src/declarative/util/qdeclarativelistmodel.cpp
| | * | Fixed infinite loop when loading jpeg without EOI from memory.Kim Motoyoshi Kalland2010-09-203-0/+6
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13653 Reviewed-by: aavit
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-201-0/+22
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixes QPen dash offset for OpenGL paint engines (1.x & 2.x). Support multisampled pbuffers under Windows. tst_qpixmapfilter: Fix compilation in namespace qtextcodec_symbian: Add few aliases Give a warning in QPixmap::handle() if pixmap is not X11 class. Make QStaticText honor QPainter::pen() for rich text on X11 w/raster Fixed compilation of MeeGo graphics system without eglext.h Fixed memory corruption issue in qt_blurImage for Indexed8 images.
| | | * tst_qpixmapfilter: Fix compilation in namespaceOlivier Goffart2010-09-201-0/+2
| | | | | | | | | | | | | | | | Reviewed-by: Samuel
| | | * Fixed memory corruption issue in qt_blurImage for Indexed8 images.Samuel Rødal2010-09-171-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If transposed was set to 0 we did not check the color depth of the image and ended up with a buffer overflow. Reviewed-by: Jens Bache-Wiig
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-178-36/+388
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Make qml debugging work with command line arguments Fix example after changes to font.letterSpacing. Autotest and small fix for QDeclarativeFontLoader. Improve error messages Changes to objects returned from get() should emit itemsChanged() so Make it clear that private ListModel constructor is only for worker Remove duplicated move() implementations Doc changes Fix QDeclarativeXmlQuery mutex locking and don't wait for new jobs if the query has already quit PathView didn't accept mouse events, preventing it from working in a Flickable. Moving items in a PathView caused PathView.onPath to be set to false. Fix worker agent to emit ListModel itemsChanged() correctly when set()
generated by cgit v0.12 at 2024-11-24 20:53:46 (GMT)