summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix QDesktopWidget::availableGeometry() on OSXFred Emmott2009-11-061-4/+8
| | | | | | | | | | | Was ignoring top OSX menu bar. Example c++: http://pastebin.ca/1585763 http://fred.uwcs.co.uk/testAvailableGeometry.cpp Example output: http://pastebin.ca/1585766 http://fred.uwcs.co.uk/testAvailableGeometry.output Introduced by commit 13254da6c3192937812983f44ce95fe8e1bc602c Merge-request: 1652 Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
* Add major Mac changes.Morten Johan Sørvig2009-11-061-0/+15
|
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-platform-team into 4.6Morten Johan Sørvig2009-11-068-9/+116
|\
| * Add support for GetURL events on Mac OS XTor Arne Vestbø2009-11-057-6/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GetURL events are delivered by Launch Services to the application if the application is registered as the default handler for the given protocol, and the user for example issues 'open http://foo.com/' in the console or clicks a link in another application. The GetURL event is converted to a QFileOpenEvent, which now has both a QUrl constructor and a url() method. These two new methods work in sync with the file() method, so a QFileOpenEvent constructed from a QUrl will return a valid file name from file() if the URL was a local file. The boolean argument to AEInstallEventHandler decides whether the handler is to be added to the system event dispatch table or the application's event dispatch table. Previously we added it to the system table, but this did not work for the GetURL event. We now use the application event table, which works for all three of the events we register on Carbon. Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com> Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
| * My changelog for merge requests I've merged into 4.6.0Denis Dzyubenko2009-11-051-0/+6
| |
| * Improve the reliability of tst_QGridLayout::minMaxSize()Bradley T. Hughes2009-11-051-2/+2
| | | | | | | | | | | | | | | | As indicated by the comments, if the test fails, the timeouts may need to be increased. Since this is failing on the test cluster, where CPU time is limited, doubling the timeouts seems to do the trick. Reviewed-by: Richard Moe Gustavsen
| * My changelog for Qt 4.6.0Denis Dzyubenko2009-11-051-1/+26
| |
* | Merge remote branch 'qt-official/4.6' into 4.6Morten Johan Sørvig2009-11-0646-188/+1374
|\ \ | |/ |/|
| * Fix bad merge from 4.5 in powervr codeRhys Weatherley2009-11-061-61/+0
| |
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Martin Jones2009-11-0537-175/+1328
| |\
| | * Doc: Fixed qdoc warnings.David Boddie2009-11-0510-38/+57
| | | | | | | | | | | | Reviewed-by: Trust Me
| | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.6David Boddie2009-11-051-2/+4
| | |\
| | | * Doc: Added a link to the online version of the Qt book (2nd edition).David Boddie2009-11-051-2/+4
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | Documentation: Updating Embedded HW acc. docsMorten Engvoldsen2009-11-051-230/+0
| | | | | | | | | | | | | | | | | | | | | | | | Removing redundant file Task-number: QT-1109
| | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Morten Engvoldsen2009-11-051-0/+49
| | |\ \
| | | * | Add changes to change log.Andreas Aardal Hanssen2009-11-051-0/+49
| | | | |
| | * | | Documentation: Embedded hardware accelerationMorten Engvoldsen2009-11-0514-44/+1299
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding docs on how to use hardware acceleration on Embedded Linux and Windows CE Task-number: QT-1109 Rev-by: Anders Bakken Rev-by: Rhys Weatherley Rev-by: Thomas Hartmann
| | * | Merge branch 'graphicseffect' into 4.6Jørgen Lind2009-11-0512-1/+59
| | |\ \
| | | * | Add QT_NO_GRAPHICSEFFECTJørgen Lind2009-11-0412-1/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It depends on QT_NO_GRAPHICSVIEW for now, but it is possible to remove this dependency. Reviewed-by: paul
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Jørgen Lind2009-11-0555-199/+777
| | |\ \ \ | | | |/ / | | |/| |
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Jørgen Lind2009-11-04125-1192/+2069
| | |\ \ \
| | * | | | Missing % for printf variableJørgen Lind2009-11-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Friedemann Kleint <friedemann.kleint@nokia.com>
| * | | | | Make declarative support in configure.exe auto.Martin Jones2009-11-052-1/+5
| | |_|/ / | |/| | | | | | | | | | | | | Reviewed-by: Warwick Allison
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Morten Johan Sørvig2009-11-051-1/+1
| |\ \ \ \
| | * | | | Revert last commit to configure, only configure.exe needed the fixDaniel Molkentin2009-11-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: con
| * | | | | Merge branch '4.5' into 4.6Morten Johan Sørvig2009-11-057-11/+101
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qsqlquery/tst_qsqlquery.cpp tests/auto/qtextlayout/tst_qtextlayout.cpp
| | * | | | Fix retrieval of SQL type "TIME" information for PostgreSQLDerick Hawcroft2009-11-052-1/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PostgreSQL can store/retieve the millisecond part of type "TIME" , so allow it in the API level. Task-number: QTBUG-5251 Reviewed-by: Bill King
| | * | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Derick Hawcroft2009-11-052-8/+3
| | |\ \ \ \
| | | * | | | Fix memory leak in the Mac accessibility module.Morten Johan Sørvig2009-11-031-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicate AXUIElement initialization in QAElment. (The duplicate code was erroneously merged in with the cocoa port.) RevBy: Richard Moe Gustavsen
| | | * | | | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.5Morten Johan Sørvig2009-11-0210-89/+168
| | | |\ \ \ \
| | | * | | | | Disable the move-by-scrolling optimization.Morten Johan Sørvig2009-11-021-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current implementation fails when moving the widget onto an area that has just been exposed as a part of a window resize operation.
| | * | | | | | Check success of query.Derick Hawcroft2009-11-051-1/+1
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For example a bogus use of setFilter() might cause a query to fail. Check for this. Reviewed-by: Bill King
| | * | | | | Fix a freeze in QFileDialog (Mac)Cédric Luthi2009-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Running an open file dialog, for example with QFileDialog::getOpenFileName() can lead to a freeze if the user selects a folder, then selects a file in the parent folder and finally confirms the open dialog. Merge-request: 1327 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
| | * | | | | Increase PowerVR memory alignment from 8 to 32 for SGX systems.Rhys Weatherley2009-11-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increasing the alignment does not seem to affect MBX. Back port of 7997279bc22d30bf1d1a30a567bda33ecc9aeb2d
| | * | | | | The shipped pvr2d.h/wsegl.h for PowerVR do not work with MBXRhys Weatherley2009-11-011-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme Back port of 4ae09215de36fcfd17dc6875aca102d784d65012
| | * | | | | Remove unnecessary PowerVR helper functionsRhys Weatherley2009-11-012-75/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cross-process memory sharing code never really worked in the way we needed it to - so remove it until something better comes along. Reviewed-by: trustme Back port of 04648b44f0784223122a782320d0b09b5c1e9497
| | * | | | | Make screen rotation work properly with the PowerVR screen driverRhys Weatherley2009-11-019-9/+162
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-2261 Reviewed-by: Tom Back port of 75719e4e06882825fe056935d782b4153bf0ac5b
| | * | | | Avoid infinite loop when laying out text with unconvertible charsEskil Abrahamsen Blomfeldt2009-10-292-40/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the stringToCMap() fails, it can be because it did not have enough space in the layout, or it can because of other errors. In order to implement "try-again" processing in a simple way, we had an infinite loop which assumed that stringToCMap() would always succeed in the second run (which would be the case if the only possible error was "not enough space".) Since there are other possible failures not related to the number of glyphs, you could easily get into an infinite loop here, e.g. when laying out text that contains the Byte Order Mark. The fix changes the implementation to explictly try stringToCMap() twice at max, and is also how it's implemented in the default qtextengine.cpp. Task-number: QTBUG-4680 Reviewed-by: Trond Conflicts: src/gui/text/qtextengine_mac.cpp tests/auto/qtextlayout/tst_qtextlayout.cpp
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-platform-team into 4.6Morten Johan Sørvig2009-11-057-23/+497
|\ \ \ \ \ \
| * | | | | | Fixed pinching in the imagegestures example.Denis Dzyubenko2009-11-052-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the gesture finishes it might not necessery set the ScaleFactorChanged flag. Also fixed the touch-event based pinch gesture. Reviewed-by: trustme
| * | | | | | Implemented Tap and TapAndHold gestures.Denis Dzyubenko2009-11-056-1/+303
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added QGesture objects and gesture recognizers based on touch events. Reviewed-by: Bradley T. Hughes
| * | | | | | Small improvement in the imagegesture example.Denis Dzyubenko2009-11-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't actually need to fill the backgroup in the example as it will be done by Qt. And when double-clicked we need to reset the scale factor properly. Reviewed-by: trustme
| * | | | | | Improved pinch gesture.Denis Dzyubenko2009-11-051-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Made sure we emit the same values for the pinch gesture as on Mac. Reviewed-by: trustme
| * | | | | | Implemented QSwipeGesture recognizer using touch events.Denis Dzyubenko2009-11-055-13/+176
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Bradley T. Hughes
* | | | | | | Make configure warn on incompatible gcc / SDK.Morten Johan Sørvig2009-11-051-0/+12
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Print a warning if configure was called with the 10.4u SDK option on Snow Leopard with the default mkspec. The 10.4u SDK does not support gcc 4.2.
* | | | | | Merge remote branch 'qt-official/4.6' into 4.6Morten Johan Sørvig2009-11-051017-40116/+29765
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Cascade delete to cleanup autotest properly.Bill King2009-11-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5373
| * | | | | Add new cross schema relation autotestBill King2009-11-051-5/+31
| | | | | | | | | | | | | | | | | | | | | | | | Autotest for http://bugreports.qt.nokia.com/browse/QTBUG-5373
| * | | | | Merge branch 'qtwebkit-4.6' into qt-4.6Jocelyn Turcotte2009-11-0434-152/+517
| |\ \ \ \ \
| | * | | | | Re-apply change 62923e7edacf6a1d28accaff70cbdc0176890d62 by Joerg BornemannJoerg Bornemann2009-11-041-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-apply change fa1856bcb2eff41dadf0900202dd43f44ddb2343 by Joerg Bornemann WebKit compile fix for Windows CE Not sure if this is right fix. We could also disable PLUGIN_PACKAGE_SIMPLE_HASH. But this is automatically enabled when NETSCAPE_PLUGIN_API is disabled. Reviewed-by: thartman