summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-2650-627/+1004
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public: (81 commits) Added addMMPRules for adding conditional MMP_RULES Allow overriding TARGET.EPOCHEAPSIZE with MMP_RULES Build break fix for commit d8465414e6fd543cfc20e732030dedd8d2bc685f. Fix for cetest. Speed up compilation of this test with MSVC. New benchmark for QDirIterator Backporting auto-test utility header from master. Fix a signed/unsigned comparison compiler warning Removed an export that shouldn't be exported. Reduced the code and memory footprint of the keymap. Enabled Qt key events to work also when native key code is missing. Cleaning of the patch to QTBUG-3168 Patch to QTBUG-3168 Crash in QGraphicsScenePrivate::setFocusItemHelper Pass the right arguments to QApplication in GraphicsView benchmark. Improvements to itemview keypad navigation in S60. Revert changes made in scroll_sys(). Fix SymbianMakefileGenerator::absolutizePath for clean builds Set the roleNames of proxy models to the roleNames of the source model. Add benchmarks for accessing meta-object properties via QScriptValue ...
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-2650-627/+1004
| |\ | | | | | | | | | | | | | | | Conflicts: qmake/generators/symbian/initprojectdeploy_symbian.cpp qmake/generators/symbian/symmake_abld.h
| | * Build break fix for commit d8465414e6fd543cfc20e732030dedd8d2bc685f.Janne Anttila2010-02-262-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | RVCT does not like static inline, and variables should not be defined in case statement without braces. In this case the temp variable was actually unnecessary. Reviewed-By: TrustMe
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-258-219/+231
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Removed an export that shouldn't be exported. Reduced the code and memory footprint of the keymap. Enabled Qt key events to work also when native key code is missing. Crash in QGraphicsScenePrivate::setFocusItemHelper Improvements to itemview keypad navigation in S60. Fix SymbianMakefileGenerator::absolutizePath for clean builds Misc fixes to FLM files
| | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-258-219/+231
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Removed an export that shouldn't be exported. Reduced the code and memory footprint of the keymap. Enabled Qt key events to work also when native key code is missing. Crash in QGraphicsScenePrivate::setFocusItemHelper Improvements to itemview keypad navigation in S60. Fix SymbianMakefileGenerator::absolutizePath for clean builds Misc fixes to FLM files
| | | | * Removed an export that shouldn't be exported.axis2010-02-251-1/+1
| | | | |
| | | | * Reduced the code and memory footprint of the keymap.axis2010-02-252-129/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was done by using a static const data structure instead of a list. RevBy: Alessandro Portale
| | | | * Enabled Qt key events to work also when native key code is missing.wasila2010-02-253-164/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If it is missing we base the event on the scan code instead. RevBy: Alessandro Portale Signed-off-by: axis <qt-info@nokia.com>
| | | | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Sami Merila2010-02-2561-705/+1087
| | | | |\
| | | | | * Improvements to itemview keypad navigation in S60.Janne Anttila2010-02-254-50/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The logic used in this commit is partially taken from sliders. This commit makes it possible to interact (change row or column) in itemview even itemview does not have editFocus. Interacting without editFocus is enabled when it is not possible to keypad navigate to reuqested direction. In addition if keypad navigation to any direction is not possible (i.e there is only one listwidget on screen), there is no sense to add "done" softkey to get out of edit focus. Task-number: QTBUG-4802 Reviewed-by: Alessandro Portale
| | | | * | Crash in QGraphicsScenePrivate::setFocusItemHelperSami Merila2010-02-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGraphicsScenePrivate::setFocusItemHelper accesses views.at(i)->inputContext() without checking if it is null. This leads to a crash if it really is null. Fixed by adding a null pointer check. Task-number: QT-3008 Reviewed-by: axis
| | * | | | Fix a signed/unsigned comparison compiler warningJoão Abecasis2010-02-251-1/+1
| | | | | |
| | * | | | Cleaning of the patch to QTBUG-3168Benjamin Poulain2010-02-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing trailing whitespace from qurl.cpp Removing a debug() output from the test. Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| | * | | | Patch to QTBUG-3168Carolina Gomes2010-02-251-5/+22
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch to QTBUG-3168 and update tst_qurl to enable the test case that was skipped. Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-251-1/+13
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | Set the roleNames of proxy models to the roleNames of the source model.Stephen Kelly2010-02-251-0/+1
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | This simplifies the use of model view with qml and proxies. Merge-request: 2315 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
| | * | | 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>
| | * | | 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-243-3/+33
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-241-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | 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/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-248-22/+89
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-248-22/+89
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-238-22/+89
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-231-2/+8
| | | | | |\ \
| | | | | | * | 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-231-0/+55
| | | | | |/ / | | | | | | | | | | | | | | | | | | | | | Task: QTBUG-7766
| | | | | * | doc: Corrected typo.Martin Smith2010-02-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task: QTBUG-8450
| | | | | * | 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-237-261/+212
| | | | | |\ \
| | | | | | * \ 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
| | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-241-1/+1
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix off-by-one error in mipmap count when loading PVRTC files
| | | * | | | | Fix off-by-one error in mipmap count when loading PVRTC filesRhys Weatherley2010-02-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-2988 Reviewed-by: Julian de Bhal
| | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-02-232-26/+78
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: win32 backend for low-level audio doesn't pass new unit tests
generated by cgit v0.12 at 2024-12-29 18:53:06 (GMT)