summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-251-1/+1
|\ | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Pass the right arguments to QApplication in GraphicsView benchmark.
| * Pass the right arguments to QApplication in GraphicsView benchmark.Bjørn Erik Nilsen2010-02-251-1/+1
| | | | | | | | | | Failed to run the test with "-style" because wrong arguments were passed to QApplication constructor.
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-252-1/+38
|\ \ | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Revert changes made in scroll_sys(). Add benchmarks for accessing meta-object properties via QScriptValue
| * | Revert changes made in scroll_sys().Fabien Freling2010-02-251-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The optimization created some glitches. It now works properly but it could be improved performance-wise. Task-number: QTBUG-5926 Task-number: QTBUG-5994 Reviewed-by: Morten Sorvig
| * | Add benchmarks for accessing meta-object properties via QScriptValueKent Hansen2010-02-251-0/+25
| | | | | | | | | | | | Reviewed-by: Benjamin Poulain
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-256-31/+119
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Set the roleNames of proxy models to the roleNames of the source model. Trying to make the animation autotests more robust Remove `make check' logic from auto.pro. Define a GNU-style `check' target for all projects.
| * | Set the roleNames of proxy models to the roleNames of the source model.Stephen Kelly2010-02-252-0/+83
| | | | | | | | | | | | | | | | | | | | | This simplifies the use of model view with qml and proxies. Merge-request: 2315 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
| * | Trying to make the animation autotests more robustThierry Bastian2010-02-252-24/+25
| | | | | | | | | | | | | | | | | | Everywhere we have a qWait(duration) followed by a QCOMPARE, there was the risk that it fails because of the test machine being overloaded. So I changed them to QTRY_COMPARE.
| * | Remove `make check' logic from auto.pro.Rohan McGovern2010-02-251-7/+0
| | | | | | | | | | | | | | | The `check' target is now automatically recursive on all subdirs projects.
| * | Define a GNU-style `check' target for all projects.Rohan McGovern2010-02-251-0/+11
| | | | | | | | | | | | Reviewed-by: Marius Storm-Olsen
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-245-46/+80
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Initialize mem to 0 Force DSFLIP_BLIT unless it's a full flip in DFB Support for disabling partial flips in dfb Allow forcing premultiplied format in DFB Documentation update regarding DFB image providers Documentation update for DirectFB Better support tlw transparency in DirectFB Fix an isOpaque bug in QDirectFBWindowSurface
| * | Initialize mem to 0Anders Bakken2010-02-241-1/+1
| | | | | | | | | | | | | | | | | | If DirectFB fails to lock a surface it won't necessarily set mem to 0. Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
| * | Force DSFLIP_BLIT unless it's a full flip in DFBAnders Bakken2010-02-241-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | If you're only updating parts of a widget we have to make sure DSFLIP_BLIT is included. Otherwise Qt's assumptions about the backing store breaks. Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
| * | Support for disabling partial flips in dfbAnders Bakken2010-02-242-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Certain boards do not properly support IDirectFBSurface->Flip() with a partial DFBRegion passed in. This problem can be worked around by exporting: QWS_DISPLAY=directfb:nopartialflip Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
| * | Allow forcing premultiplied format in DFBAnders Bakken2010-02-241-1/+5
| | | | | | | | | | | | | | | | | | | | | This was already possible in non-WM mode. I now enable using the same connect argument to make it work for WM. Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
| * | Documentation update regarding DFB image providersAnders Bakken2010-02-241-1/+2
| | | | | | | | | | | | | | | | | | Make a note about alpha channels and QT_NO_DIRECTFB_IMAGEPROVIDER Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
| * | Documentation update for DirectFBAnders Bakken2010-02-241-0/+5
| | | | | | | | | | | | | | | | | | Add a note about changing top level transparency at runtime. Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
| * | Better support tlw transparency in DirectFBAnders Bakken2010-02-242-40/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | Since we don't have a dedicated function that gets called when isOpaque changes for a window we do not support making an existing window non-opaque at runtime. Supporting this would require considerable overhead per flush and we do not want that. Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
| * | Fix an isOpaque bug in QDirectFBWindowSurfaceAnders Bakken2010-02-241-2/+2
|/ / | | | | | | | | | | The logic was reversed. Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-244-3/+59
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed translucent window rendering on 16 bit X11. GV: Update issues if drawItems() is overridden and IndirectPainting is used. More pedantry. Fix grammar. Doc: QFutureWatcher: specify that calls to setFuture should happen after the connections
| * | Fixed translucent window rendering on 16 bit X11.Samuel Rødal2010-02-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Don't assume format is the same as systemFormat() in the QNativeImage constructor, for translucent windows it's always ARGB32_Premultiplied, and the depth of the window is always 32 bit. Reviewed-by: Trond
| * | GV: Update issues if drawItems() is overridden and IndirectPainting is used.Bjørn Erik Nilsen2010-02-242-2/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem was that the cached view bounding rect was never updated when overriding QGraphicsScene::drawItems or QGraphicsView::drawItems, without calling the base class implementation. The same for 'updateAll' boolean. We also have to make sure there are no unpolished items before we draw. Regression against 4.5. Auto-test included. Task-number: QTBUG-7880 Reviewed-by: yoann
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-241-0/+7
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: More pedantry. Fix grammar. Doc: QFutureWatcher: specify that calls to setFuture should happen after the connections
| | * | More pedantry.Trond Kjernåsen2010-02-241-2/+2
| | | | | | | | | | | | | | | | Reviewed-by: Kim
| | * | Fix grammar.Trond Kjernåsen2010-02-241-2/+3
| | | | | | | | | | | | | | | | Reviewed-by: Kim
| | * | Doc: QFutureWatcher: specify that calls to setFuture should happen after the ↵Olivier Goffart2010-02-241-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | connections Reviewed-by: Morten Sorvig
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-244-7/+14
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix extensions section in bld.inf when CONFIG contains symbian_test
| * | | Fix extensions section in bld.inf when CONFIG contains symbian_testMiikka Heikkinen2010-02-244-7/+14
| |/ / | | | | | | | | | | | | | | | | | | | | | Prj_extensions tag is replaced with prj_testextensions tag when CONFIG contains symbian_test Task-number: QT-2985 Reviewed-by: Janne Koskinen
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-243-3/+26
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QNAM HTTP: Switch back to QueuedConnection for requeueRequest. QNAM HTTP: Set some values after clear() in a QHttpNetworkReply QNetworkAccessManager: Documentation enhancements
| * | QNAM HTTP: Switch back to QueuedConnection for requeueRequest.Markus Goetz2010-02-241-2/+16
| | | | | | | | | | | | Reviewed-by: Peter Hartmann
| * | QNAM HTTP: Set some values after clear() in a QHttpNetworkReplyMarkus Goetz2010-02-241-0/+2
| | | | | | | | | | | | Reviewed-by: TrustMe
| * | QNetworkAccessManager: Documentation enhancementsMarkus Goetz2010-02-241-1/+8
| | | | | | | | | | | | | | | Reviewed-by: Peter Hartmann Reviewed-by: David Boddie
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-247-84/+144
|\ \ \ | |/ / |/| | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Basic deployment support for ROM in Symbian
| * | Basic deployment support for ROM in SymbianMiikka Heikkinen2010-02-247-84/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deploy everything currently deployed under /epoc32/winscw/c to also under /epoc32/data/z to make is easier to deploy applications to ROM. Also changes path separators in deployment generation to be Linux friendly. Reviewed-by: Janne Anttila
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-2411-26/+98
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QLineEdit shows leftovers of edit cursor after clear() doc: Added indication of default modality value for panels. doc: Added QScopedArrayPointer and corrected QScopedPointer snippet. Improve test coverage of QScriptString::toArrayIndex() QColorDialog::open() freezes the app the *second* time it is used on Mac doc: Corrected typo. doc: Removed bad grammar. doc: Added \obsolete. doc: Added \since 4.6 to the properties. doc: Removed some erroneous text.
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-2411-26/+98
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QLineEdit shows leftovers of edit cursor after clear() doc: Added indication of default modality value for panels. doc: Added QScopedArrayPointer and corrected QScopedPointer snippet. Improve test coverage of QScriptString::toArrayIndex() QColorDialog::open() freezes the app the *second* time it is used on Mac doc: Corrected typo. doc: Removed bad grammar. doc: Added \obsolete. doc: Added \since 4.6 to the properties. doc: Removed some erroneous text.
| | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-2311-26/+98
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QLineEdit shows leftovers of edit cursor after clear() doc: Added indication of default modality value for panels. doc: Added QScopedArrayPointer and corrected QScopedPointer snippet. Improve test coverage of QScriptString::toArrayIndex() QColorDialog::open() freezes the app the *second* time it is used on Mac doc: Corrected typo. doc: Removed bad grammar. doc: Added \obsolete. doc: Added \since 4.6 to the properties. doc: Removed some erroneous text.
| | | * | QLineEdit shows leftovers of edit cursor after clear()Prasanth Ullattil2010-02-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The commit 0568fb9f428a84a344baaa5c53395db4b99f082c introduced this regression. Make sure that we have text in the lineedit before showing the cursor. Task-number: QTBUG-7826 Reviewed-by: Olivier Goffart
| | | * | doc: Added indication of default modality value for panels.Martin Smith2010-02-231-3/+10
| | | | | | | | | | | | | | | | | | | | Task: QTBUG-7970
| | | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-02-232-2/+14
| | | |\ \
| | | | * | Improve test coverage of QScriptString::toArrayIndex()Kent Hansen2010-02-231-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test decimals and scientific notation. "0.0" is not a valid array index even though it can be converted to a whole integer, because the number converted back to a string again is "0", which is different from "0.0". (See ECMA 15.4)
| | | | * | QColorDialog::open() freezes the app the *second* time it is used on MacCarlos Manuel Duclos Vergara2010-02-231-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem here is caused by a boolean flag used to prevent recursion. The flag was set and never reset. This patch resets the flag the moment open is called. Task-number: QTBUG-7825 Reviewed-by: Richard Moe Gustavsen
| | | * | | 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.
| | | * | | | 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
generated by cgit v0.12 at 2024-12-02 05:54:04 (GMT)