summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* doc: Added QScopedArrayPointer and corrected QScopedPointer snippet.Martin Smith2010-02-232-1/+56
| | | | Task: QTBUG-7766
* doc: Corrected typo.Martin Smith2010-02-231-2/+2
| | | | Task: QTBUG-8450
* doc: Removed bad grammar.Martin Smith2010-02-231-3/+2
| | | | Task: QTBUG-8033
* doc: Added \obsolete.Martin Smith2010-02-232-7/+10
| | | | Task: QTBUG-8083
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-02-239-448/+331
|\
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-231-6/+0
| |\ | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: doc: Removed some erroneous text.
| * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-02-232-118/+67
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: alsa backend for low-level audio doesn't pass new unit tests
| | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6Kurt Korbatits2010-02-23265-1969/+5811
| | |\ \ | | |/ / | |/| |
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-02-232-86/+66
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Updates to low-level audio documentation.
| * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-225-244/+198
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Improve performance of VGPath creation by reusing the same path Stabilize QWidget benchmarks. Stylesheet: Fix size specified in QToolbar::handle fix crash on Windows CE on WM_SETTINGCHANGE Stabilize style sheet benchmarks.
| | * | | | Improve performance of VGPath creation by reusing the same pathRhys Weatherley2010-02-221-57/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The vgClearPath() function can be used to clear a path for reuse more efficiently than destroying the path and creating a new one. Task-number: QT-2974 Reviewed-by: Daniel Pope
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-224-187/+131
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Stabilize QWidget benchmarks. Stylesheet: Fix size specified in QToolbar::handle fix crash on Windows CE on WM_SETTINGCHANGE Stabilize style sheet benchmarks.
| | | * | | | Stabilize QWidget benchmarks.Bjørn Erik Nilsen2010-02-221-187/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit also removes the complexToplevelResize test; it is not suitable for automated testing as the output is too unstable.
| | | * | | | Stylesheet: Fix size specified in QToolbar::handleOlivier Goffart2010-02-221-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression since f0243e70e05a3368582fd0478d840096d6b60c3f We added a new rule (SE_ToolBarHandle) and the baseStyle was calling pixelMetric(PM_ToolBarHandleExtent) on itself, bypassing the QStyleSheetStyle Reviewed-by: Thierry Task-number: QTBUG-8348
| | | * | | | fix crash on Windows CE on WM_SETTINGCHANGEJoerg Bornemann2010-02-221-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Windows CE, lParam parameter is a constant, not a char pointer. The only valid value is INI_INTL. Task-number: QTBUG-7943 Reviewed-by: ninerider
| | | * | | | Stabilize style sheet benchmarks.Bjørn Erik Nilsen2010-02-221-0/+9
| | | | | | |
| | | | | * | alsa backend for low-level audio doesn't pass new unit testsKurt Korbatits2010-02-232-118/+67
| | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New unit tests have identified issues with alsa backend. These issues need to be resolved before new unit tests are added. * stateChanged() signal should only be emitted on change of state currently signals can be emitted multiple times. * elapsedUSecs() currently uses alsa to provide this value but this is not reliable enough and this time is reset when suspend/resuming. This is not correct operation. * for output data is being lost when input cant be read from QIODevice but cannot be written to audio sub system. Task-number:QTBUG-8440 Reviewed-by:Dmytro Poplavskiy
| | | | * | Updates to low-level audio documentation.Kurt Korbatits2010-02-232-86/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Detail state changes and error states in QAudioInput and QAudioOutput documentation. Reviewed-by: Derick Hawcroft
* | | | | | doc: Added \since 4.6 to the properties.Martin Smith2010-02-231-1/+3
| |_|_|_|/ |/| | | | | | | | | | | | | | Task: QTBUG-8333
* | | | | doc: Removed some erroneous text.Martin Smith2010-02-231-6/+0
|/ / / / | | | | | | | | | | | | Task: QTBUG-7965
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-2212-108/+302
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix memory leak when lazily binding QScriptValue to an engine Build fix for 976a2b6ad1f95175d8d0be2d1eb7603cf4e4026a. QAbstractSocket: Clarify documentation QFontDialog::exec() never returns on OSX QNetworkRequest: Doc enhancement Port http example to QNetworkAccessManager loopback network example: Make use of bytesToWrite()
| * | | Fix memory leak when lazily binding QScriptValue to an engineKent Hansen2010-02-222-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid the engine's list of free script values from growing without bounds. When a QScriptValue is initially not bound, its private will be allocated from the normal heap (and not from the engine's pool of privates, because there is no engine at this point). But when a value is later bound (e.g. by setting it as a property of an object, or by passing it as argument to QScriptValue::call()) and is subsequently destroyed, its private will be handed to the engine, which will add it to its free-list (hence the memory is not freed). This allocation/deallocation asymmetry causes this list go keep growing. The solution is to limit the size of the free-list, and free the memory of the private immediately when the list has reached a certain size. Task-number: QTBUG-8400 Reviewed-by: Olivier Goffart
| * | | Build fix for 976a2b6ad1f95175d8d0be2d1eb7603cf4e4026a.Carlos Manuel Duclos Vergara2010-02-221-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Forgot to add some #ifdef's. Reviewed-by: Richard Moe Gustavsen
| * | | QAbstractSocket: Clarify documentationMarkus Goetz2010-02-221-2/+8
| | | | | | | | | | | | | | | | Reviewed-by: Thiago
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-229-101/+279
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QFontDialog::exec() never returns on OSX QNetworkRequest: Doc enhancement Port http example to QNetworkAccessManager loopback network example: Make use of bytesToWrite()
| | * | | QFontDialog::exec() never returns on OSXCarlos Manuel Duclos Vergara2010-02-224-27/+188
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is the fact that this dialog is never meant to be used this way. Instead it should be called through the static function ::getFont(...). I reimplemented this code path and made sure that this works. Task-number: QTBUG-7769 Reviewed-by: Richard Moe Gustavsen
| | * | | QNetworkRequest: Doc enhancementMarkus Goetz2010-02-221-0/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| | * | | Port http example to QNetworkAccessManagerMarkus Goetz2010-02-223-71/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QHttp. Must. Die. Reviewed-by: Peter Hartmann
| | * | | loopback network example: Make use of bytesToWrite()Markus Goetz2010-02-211-3/+7
| | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-223-25/+16
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Changed canonical paths to absolute paths in symmake. Don't use vgClear() for semi-transparent brushes.
| * | | | Changed canonical paths to absolute paths in symmake.Miikka Heikkinen2010-02-222-23/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Canonical paths were resolving to empty if the paths didn't exist, which causes problems for clean platform builds. Using absolute paths instead will generate all required paths. This will cause a minor inconvenience of warnings about some nonexistent paths during makefile generation phase of abld builds, but this is unavoidable. Sbsv2 builds do not display any warnings. Reviewed-by: Janne Anttila
| * | | | Don't use vgClear() for semi-transparent brushes.Jason Barron2010-02-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the brush is not totally opaque we should not use vgClear() at this point because vgClear() does not support blending. Instead it writes the values directly into the surface which clobbers any existing content. The bug exhibits itself when a child widget fills itself with any transparent color. Instead of blending with the parent widget's content, it writes the semi-transparent color directly to the surface, overwriting the parent content and leaving the surface in a somewhat undefined state because the alpha channel is not honoured unless Qt::WA_TranslucentBackground is set. Task-number: QTBUG-8007 Reviewed-by: Rhys Weatherley
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-221-3/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: amend the doc, as suggested by rittk
| * | | | | amend the doc, as suggested by rittkOswald Buddenhagen2010-02-221-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8070
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-227-5/+44
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixes for the Windows Mobile plattform Fixes: make check not checking that target is up to date
| * | | | | Fixes for the Windows Mobile plattformninerider2010-02-226-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | These fixes mainly concern compiling issues.
| * | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Bill King2010-02-223-2/+16
| |\ \ \ \ \
| * | | | | | Fixes: make check not checking that target is up to dateBill King2010-02-221-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Builds the target executable if needed before running the test LR on BKing's machine. Reviewed-by: Lincoln Ramsay
| * | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-sql-team into 4.6Bill King2010-02-2279-695/+4195
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-sql-team into 4.6Bill King2010-02-19265-1043/+2114
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-sql-team into 4.6Bill King2010-02-16303-880/+20194
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-sql-team into 4.6Bill King2010-02-1035-558/+497
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-sql-team into 4.6Bill King2010-02-099351-23473/+54739
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Bill King2010-01-1216-319/+507
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-sql-team into 4.6Bill King2010-01-12437-4902/+16961
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Bill King2009-12-1637-817/+1468
| |\ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed shadow builds on Unix.
| * | | | | | | | | | | | | | Fixed shadow builds on Unix.Rohan McGovern2010-02-221-1/+1
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-222-1/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | / / / / / | |_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Don't process uic3 subdir if qt3support is disabled. Fixed failure of tst_symbols when Qt is configured with -qtnamespace
| * | | | | | | | | | | | | Don't process uic3 subdir if qt3support is disabled.Rohan McGovern2010-02-221-1/+3
| | | | | | | | | | | | | |