summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix QT_NO_WHEELEVENTJørgen Lind2009-11-061-0/+2
| | | | Reviewed-by: Trust Me
* Fix QT_NO_WHATSTHISJørgen Lind2009-11-061-0/+2
| | | | Reviewed-by: tom
* Fix QT_NO_MENUBARJørgen Lind2009-11-061-0/+2
| | | | Reviewed-by: tom
* Fix QT_NO_SHORTCUTJørgen Lind2009-11-062-2/+4
| | | | Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Fix QT_NO_DATESTRINGJørgen Lind2009-11-062-0/+4
| | | | Reviewed-by: tom
* Fix QT_NO_GRAPHICSEFFECTJørgen Lind2009-11-065-2/+33
| | | | Reviewed-by: paul
* Fix QT_NO_TABLETEVENTJørgen Lind2009-11-061-0/+6
| | | | Reviewed-by: tom
* Fix QT_NO_STATUSTIPJørgen Lind2009-11-061-0/+2
| | | | Reviewed-by: paul
* Fix QT_NO_TOOLBARJørgen Lind2009-11-061-0/+2
| | | | Reviewed-by: tom
* Support composition mode source for drawing in dfbAnders Bakken2009-11-061-19/+52
| | | | | | | | | | | Qt's/DirectFB's composition modes are not compatible for drawing operations. We only support SourceOver and handle whether or not to blend colors using DSDRAW_BLEND based on the alpha/opacity value. If drawing with Source and an opaque color we can still handle the operation using DirectFB. This has major impact since WebKit fills the background of web pages using Source. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Reset composition mode after drawing in dfbAnders Bakken2009-11-061-3/+8
| | | | | | | | When drawing primitives in DirectFB we always set composition mode to NONE and manually manage whether or not to blend. This patch makes sure we will reset the composition mode afterwards. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* 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
* | | | | 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
| * | | | | Re-apply change cadd19cd98b9a6ff7ff8755f7774027400aadb0f by Shane KearnsShane Kearns2009-11-041-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-apply change 6bc9ef388590b4bfb281d2e1510dc7c3d1837349 by Shane Kearns Fix to 8e0fbc2caa3edefb78d6667721235b783bc1a850 This version of the fix will set the def file only if defblock is enabled in qbase.pri. That means that def files don't get turned on for webkit but not for the whole project (avoids build failures in the continuous integration system when other teams change the exported symbols) Reviewed-by: Jason Barron
| * | | | | Re-apply change b4be512bffba65bf4577a2b8275d7c38ce5501a1 by David BoddieDavid Boddie2009-11-041-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-apply change 6f36d0aafaccbb9affe8ac1b82c225d985aa7491 by David Boddie Doc: Added internal or hidden placeholder documentation. Reviewed-by: Trust Me To-be-completed-by: QtWebKit developers
| * | | | | Re-apply change 7293097060383bcb75ee9f3e6a270de3b5bee2dc by Thiago MacieiraThiago Macieira2009-11-041-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-apply change e2ef97128c006ac2a5c99c67bb54eebaa3b45720 by Thiago Macieira Implement symbol hiding for JSC's JIT functions. These functions are implemented directly in assembly, so they need the proper directives to enable/disable visibility. On ELF systems, it's .hidden, whereas on Mach-O systems (Mac) it's .private_extern. On Windows, it's not necessary since you have to explicitly export. I also implemented the AIX idiom, though it's unlikely anyone will implement AIX/POWER JIT. That leaves only HP-UX on PA-RISC unimplemented, from the platforms that Qt supports. It's also unlikely that we'll imlpement JIT for it. Reviewed-by: Kent Hansen (this commit was 26d0990c66068bfc92a2ec77512b26d4a0c11b02, but was lost during a WebKit update)
| * | | | | Re-apply change cbb2efb13cdf05aabc245e2b0157883146cf069d by Thiago MacieiraThiago Macieira2009-11-041-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-apply change 3f7a99565de7ed17d7ac4c0a25b02997b094b1a9 by Thiago Macieira Fix linking of WebKit on Linux 32-bit. It was missing the ".text" directive at the top of the file, indicating that code would follow. Without it, the assembler created "NOTYPE" symbols, which would result in linker errors.
| * | | | | Re-apply change 914de965a8380e7620209c7b26e984ed9fbccc57 by David BoddieDavid Boddie2009-11-042-7/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-apply change 37dc859e7e2e0f135e4c40bc7f6f824fcdb21e86 by David Boddie Doc: Fixed and synchronized QWebView related documentation. Reviewed-by: Trust Me
generated by cgit v0.12 at 2024-11-30 19:14:08 (GMT)