summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Make QMenu::activateCausedStack() exception safe.Marius Bugge Monsen2009-10-211-3/+11
| | | | | | Use an internal class to reset the activationRecursionGuard when the scope is closed. Reviewed-by: Leo Cunha
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Marius Bugge Monsen2009-10-2159-30608/+55424
|\
| * Make Symbian emulator behave the same as device for mouse & touchscreenShane Kearns2009-10-211-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Emulator HAL reports that it supports mouse but not touch. Since Qt is changing behaviour based on these values, the emulator works differently from the device. To workaround, the emulator HAL values are ignored and following used: 5.0: mouse 0, touch 1 3.x: mouse 0, touch 0 The mouse can still be used to interact with the emulator, as pointer events are still delivered. Task-number: QTBUG-4803 Task-number: QTBUG-4616 Reviewed-by: Sami Merila
| * Cleaned up the API of the Symbian event hooks.axis2009-10-2112-76/+361
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The two major points were: - Replacing "s60" with "symbian" in all event handling functions, since there is nothing S60-specific about them. - Replace the Symbian event types with the encapsulating QSymbianEvent container. This allows us to cope with more types of events in the future without having to add new virtual functions. AutoTest: QWidget passed Task: QT-1156 RevBy: Jason Barron RevBy: Shane Kearns RevBy: Sami Merila
| * fix editable comboboxes in the Windows mobile styleJoerg Bornemann2009-10-211-31/+73
| | | | | | | | | | | | | | | | In editable QComboBoxes we used cutting-edge technology to display the text. But that's not always wanted. We actually want to see all pixels of a string like "why oh why". The lower edge was cut off. Reviewed-by: thartman
| * Revert "Switch from *-armv5 to *-armv6."Frans Englich2009-10-218-17/+17
| | | | | | | | | | | | | | | | | | This reverts commit a6af1538ea53408399fb29870a4ef16a92c7893a. armv6 is not supported by public SDKs, due to armv6/urel not existing. Such SDKs needs to be fixed by copying the armv5 files. Hence we revert, and postpone until we have SDKs which actually support armv6, and until we have a stronger insight into what advantages armv6 brings.
| * don't remap VK_RETURN on Windows mobile if not in keypad navigation modeJoerg Bornemann2009-10-211-2/+2
| | | | | | | | Reviewed-by: TrustMe
| * Fixed .make.cache write collision on symbian-sbsv2 buildsMiikka Heikkinen2009-10-211-0/+9
| | | | | | | | | | | | | | | | | | | | If a project was built for more than one target with single sbs command, .make.cache generation could sometime fail because multiple jobs attempted to write into it simultaneously. Now only one of the specified targets will be used to generate .make.cache, making collisions impossible. Reviewed-by: Janne Anttila
| * S60Style's tab widget is too small for touch useSami Merilä2009-10-214-4/+36
| | | | | | | | | | | | | | | | | | | | TabWidget for S60Style is too small for touch use, it is rather hard to accurately touch the tabpane to switch the active tab. To fix this, we ask the native tabpane height from AVKON and set the QTabWiget's pane height to native height (or bigger). Task-number: QTBUG-4243 Reviewed-by: Alessandro Portale
| * Switch from *-armv5 to *-armv6.Frans Englich2009-10-218-17/+17
| | | | | | | | | | | | | | | | Change from armv5 to armv6 by default. This updates documentation, the convenience scripts, and the Raptor/abld qmake generator to use armv6 instead. Task-number: QTBUG-4891 Reviewed-by: Jason Barron
| * Included table for definition of plural forms for different languages.Peter Yard2009-10-211-3/+334
| |
| * VXWorks changes.Bill King2009-10-211-5/+24
| | | | | | | | Forward port the vxworks changes from d7b688870aead912690188b324d370b920a7a600
| * Fixes: WebKit Windows CE buildBill King2009-10-211-1/+1
| | | | | | | | | | | | | | | | Details: Details: Make localtime a static function. This is needed for linking sqlite3.lib into webkit and it generally makes sense for our build of sqlite using the amalgamated build. (cherry picked from commit 5e326c74239eecbd3e64df90ebbafaf51530d43d)
| * Trolltech modifications to SQLite.Bill King2009-10-211-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Include <qconfig.h> and rely on Qt's QT_NO_THREAD instdead of SQLite's THREADSAFE to toggle source code releated to threading in SQLite. * compilation for Windows CE 6 While for WinCE 5 localtime is declared but not defined in the libraries, for CE 6 they are not even declared. That usually makes sense but sqlite relies on it being present in time.h. As sqlite defines their own localtime for Windows CE, we "only" need to forward declare it earlier. Conflicts: src/3rdparty/sqlite/sqlite3.c
| * Update sqlite to 3.6.19Bill King2009-10-212-30056/+53754
| |
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Kurt Korbatits2009-10-2168-1047/+1974
| |\
| | * Increase PowerVR memory alignment from 8 to 32 for SGX systems.Rhys Weatherley2009-10-201-1/+1
| | | | | | | | | | | | Increasing the alignment does not seem to affect MBX.
| | * Ensure qmake does not lose the error code when going over the subdirsAndy Shaw2009-10-203-7/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When qmake was ran with -r over a subdirs project then it would lose the error code if a later project succeeded. This is a refix of the previous revert which has been confirmed to work all over the place now. Reviewed-by: Marius Storm-Olsen
| | * Fix tst_QHeaderView::length() on Symbian.Liang QI2009-10-201-1/+4
| | | | | | | | | | | | | | | | | | Just the default font size will not work for this case. We set it to smaller one. Notice: we should make sure view->length() is different between view->setStretchLastSection(true) and view->setStretchLastSection(false). RevBy: Aleksandar Babic
| | * Introduce the QAccessibleActionInterfaceHarald Fernengel2009-10-205-2/+103
| | | | | | | | | | | | | | | | | | | | | | | | with a sample implementation for QAccessibleButton. Not implemented for all widgets yet (API is preliminary). Patch has been in the accessibility-fixes branch of qt-maemo for quite a while now without complains, thus no reviewer.
| | * Implement QAccesibleValueInterface for QProgressBarHarald Fernengel2009-10-203-1/+50
| | | | | | | | | | | | | | | Patch has been tested thorougly in the accessibility-fixes branch of the qt-maemo repository, thus no review
| | * Assistant: Fix syntax error.ck2009-10-201-1/+1
| | | | | | | | | | | | | | | The offending code is normally ifdef'ed out, so the bug did not manifest itself before.
| | * Set OFN_PATHMUSTEXIT as a default parameterMartin Pejcoch2009-10-201-2/+2
| | | | | | | | | | | | | | | | | | | | | This will result in a warning if the path entered doesn't exist, which is the behavior of native applications. Reviewed-by: Prasanth
| | * Merge commit 'qt/4.6' into mmfphononFrans Englich2009-10-2043-919/+1691
| | |\
| | | * Windows CE gets a different paint event count than windowsninerider2009-10-201-2/+4
| | | | | | | | | | | | | | | | Reviewed-by: Joerg
| | | * Test fixes for Windows Mobile.ninerider2009-10-202-96/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Accounting for double resolution devices on Windows Mobile in the test data sets (tst_qgraphicsview_2.cpp). Skipped a test involving mouse tracking (tst_qgraphicsview.cpp). Reviewed-by: Joerg
| | | * Mac: fix bug when reparenting non-native menu barsRichard Moe Gustavsen2009-10-203-4/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we reparent a naive menu bar inside a widget that has a menu bar from before, the old menu bar is lost. This patch makes sure that we don't set the new menu bar in this case, but let it remain as-is in case the widget is reparanted out again later. Rev-By: MortenS
| | | * Fixed QFileDialog crash on SymbianMiikka Heikkinen2009-10-201-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | softKeyActions QHash in QDialogButtonBoxPrivate was not kept properly in sync with standardButtonHash, causing QFileDialog to crash upon startup. Reviewed-by: Sami Merila
| | | * Use premultiplied alpha pixel format in SymbianShane Kearns2009-10-2011-26/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gives better performance in the raster paint engine. For Symbian 9.3 onwards, this can also be used as the native pixmap format. For 9.2, conversion is required. Reviewed-by: Sami Merila Reviewed-by: Jani Hautakangas
| | | * QT-693 QS60Style does not regard selection beahviors with itemviewsSami Merilä2009-10-201-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QS60Style disregards all selection behaviors for itemviews. This leads to error when showing a highlighted selection rect; rect is only shown for cell having focus. Fixed by setting the highlight to all 'selected' cells. Task-number: QT-693 Reviewed-by: Alessandro Portale
| | | * changes-4.6.0 updatedJoerg Bornemann2009-10-201-0/+6
| | | |
| | | * Doc update for QDir::rootPath and QDir::homePath in Symbian.Janne Anttila2009-10-201-2/+3
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-4867 Reviewed-by: Aleksandar Sasha Babic
| | | * i18n: Complete German translations for 4.6.0 (XmlPatterns)Friedemann Kleint2009-10-201-317/+326
| | | |
| | * | Fix bug introduced by cleanup commit.Frans Englich2009-10-201-2/+0
| | | | | | | | | | | | | | | | Reviewed-by: Gareth Stockwell
| * | | Fixed compile issue with alsa < 1.0.14Kurt Korbatits2009-10-215-4/+74
| | | | | | | | | | | | | | | | | | | | | | | | Support pre 1.0.14 alsa version. Reviewed-by:Justin McPherson
* | | | Clips color interpolation to range [0, 255]Leonardo Sobral Cunha2009-10-211-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoid warnings when using easing curves that progress outside the range [0.0, 1.0]. Patch proposed by warwick. Reviewed-by: Warwick Allison
* | | | Merge branch 'qgal-api' into 4.6Jan-Arve Sæther2009-10-212-7/+18
|\ \ \ \
| * | | | Group the spacing functions together, and add a sizePolicy property.Jan-Arve Sæther2009-10-212-7/+18
| | | | | | | | | | | | | | | | | | | | Improve the documentation for size policy.
* | | | | Fixes to the way animations are registered to the timerThierry Bastian2009-10-211-12/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It could happen that an animation would be unregistered when it shouldn't. Reviewed-by: Leo Cunha
* | | | | Improve performance when starting a lot of animationsThierry Bastian2009-10-211-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We avoid stopping/starting the timer over and over again Patch suggested by Aaron. Reviewed-by: Aaron Kennedy
* | | | | Optimization in qt_closestItemFirst private functionLeonardo Sobral Cunha2009-10-201-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No need to traverse the tree again to access the topLevelItem in case there is no common ancestor. Reviewed-by: bnilsen
* | | | | Moved private function to test which graphic items is in front of the otherLeonardo Sobral Cunha2009-10-205-70/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function is moved to graphicsitem private because it is needed by multi-touch event handling and is not specific to bsptreeindex. Reviewed-by: bnilsen
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-widget-team into 4.6Jan-Arve Sæther2009-10-202-15/+27
|\ \ \ \ \
| * | | | | Extended commit 6c1388ee for LeftToRight flowGabriel de Dietrich2009-10-202-15/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-test updated. As a bonus, stabilized tst_QListView::task262152_setModelColumnNavigate. Reviewed-by: Thierry
* | | | | | Merge branch 'qlayout-make_adjustSize_better' into 4.6Jan-Arve Sæther2009-10-202-2/+30
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Make adjustSize work even if there is a pending LayoutRequest event.Jan-Arve Sæther2009-10-202-2/+30
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original report was that the customer did resize(main.sizeHint()) instead of the main.adjustSize(); Note that resize(main.sizeHint() still does not work. However, calling main.adjustSize() should now do what the original reporter wanted. The problem was that the resize did not work, because at the point of the resize the minimumHeight of main was still 22 (8+6+8), and we tried to resize it with a new height of 10. The resize would bound the height up to 22, and the main widget would then get a size of (200x22). The reason why it still had a minimumHeight of 22 was that it was the minimumSize of the previous layout configuration. Unfortunately the new minimumSize of the widget hadn't been updated yet because there was a LayoutRequest event in the queue that hadn't been processed yet. (This LayoutRequest was triggered by that we called invalidate() from hide()). Thus, processing the event queue immediately after the hide() could also have been a workaround for this issue. There is no really good fix for this issue (and it does not seem to be a common problem) without introducing a risk for regressions. Due to that we therefore decided to provide a fix in QWidget::adjustSize(). Reviewed-by: paul
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-widget-team into 4.6Jan-Arve Sæther2009-10-20283-5072/+5381
|\ \ \ \ \
| * | | | | fix for QTreeView to not animate if there are no visible childrenThierry Bastian2009-10-201-4/+6
| | | | | |
| * | | | | Fixed QTreeView trying to animate when parent item has no childThierry Bastian2009-10-202-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now check that the item has children before animating. Reviewed-by: Alexis
| * | | | | Fixed a bug in that could unregister not-registered animationsThierry Bastian2009-10-201-2/+3
| | | | | |