summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* qdoc: The gray version.Martin Smith2009-06-091-1/+1
|
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtDavid Boddie2009-06-0936-412/+510
|\
| * small improvement/refactor to cssparserThierry Bastian2009-06-092-42/+1
| |
| * small change to reduce static data sizeThierry Bastian2009-06-092-2/+2
| |
| * Prevented pixmap FBOs from growing too big.Samuel Rødal2009-06-091-0/+5
| | | | | | | | | | | | | | | | If we're painting to very wide and then very tall pixmaps we don't want the FBO to grow to max_width * max_height, instead we should recreate the FBO if it grows too large compared to what's being painted. Reviewed-by: Trond
| * Optimized stencil buffer clearing in GL 2 paint engine.Samuel Rødal2009-06-092-42/+9
| | | | | | | | | | | | | | | | Based on Zack's patch, 17e1bca1ce366395f8331e16aa96b7176ca1abac. Instead of manually clearing the stencil buffer after drawing we simply do the clearing and drawing in one go. Reviewed-by: Trond
| * Resolved FBO extensions as well when resolving GL 2 extensions.Samuel Rødal2009-06-091-0/+3
| | | | | | | | | | The new GL 2 text drawing requries the FBO function pointers to be resolved.
| * Improved clipping in GL2 paint engine.Samuel Rødal2009-06-097-186/+343
| | | | | | | | | | | | | | | | | | | | | | | | | | Use the stencil method to draw clip paths and regions to the Z-buffer instead of using glClear / glScissor. Using different depth values for the various clip parts also makes restore() very cheap when only IntersectClip is used. As an additional bonus this patch gives antialiased clip in the GL 2 paint engine. Task-number: 254658 Reviewed-by: Trond
| * Fix floating point exception in QImageReader::setScaledSize(QSize(0, 0))Leonardo Sobral Cunha2009-06-091-1/+2
| | | | | | | | | | | | | | | | Avoid a division by 0 when doing QImageReader::setScaledSize(QSize(0, 0)) for jpeg formats. Reviewed-by: thierry Task-number: 255627
| * Fix focus frame on combobox on non-Windows stylesOlivier Goffart2009-06-093-3/+5
| | | | | | | | | | | | | | | | | | State_KeyboardFocusChange only makes sens on Windows. Follow the logic on the combobox as in PE_FrameFocusRect in the QWindowsStyle Task-number: 255482 Reviewed-by: jbache
| * small refactoring to reduce memory usage of static dataThierry Bastian2009-06-094-11/+10
| |
| * Another breakage in 1bbe23c5 - move qpaintengineex_opengl2_p.h include upRhys Weatherley2009-06-091-3/+6
| | | | | | | | | | | | | | | | Moving qpaintengineex_opengl2_p.h down caused it to come after an include of <X11/Xlib.h>, which causes problems on some platforms. Move it back up again. Reviewed-by: trustme
| * Fix build breakage from 1bbe23c5 - endif in the wrong placeRhys Weatherley2009-06-091-1/+1
| | | | | | | | Reviewed-by: trustme
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtRhys Weatherley2009-06-091-2/+2
| |\
| | * Fixed compile with MinGW 3.4.Rohan McGovern2009-06-091-2/+2
| | | | | | | | | | | | | | | | | | | | | This compiler doesn't seem to follow the same rule as others for implicit conversions to/from wchar_t. Add the necessary casts, keeping in mind that sizeof(wchar_t) == 2 on Windows.
| * | Make OpenGL/ES 1.1 work again for Qt/EmbeddedRhys Weatherley2009-06-094-4/+21
| | | | | | | | | | | | Reviewed-by: trustme
| * | Protect EGL property names that only exist in some versions with #ifdefsRhys Weatherley2009-06-091-1/+9
| |/ | | | | | | Reviewed-by: trustme
| * openUrl("mailto:") fails to open Thunderbird on windows.Prasanth Ullattil2009-06-081-36/+28
| | | | | | | | | | | | | | | | | | | | | | Thunderbird sets only the user level shell association for mailto. This is now being read before the default mail application registry. The registry crawling could have been avoided by using the ShellExecute() but it supports only around 2KBytes of data as parameter, so we will continue using CreateProcess(). Task-number: 251554 Reviewed-by: Jens Bache-Wiig
| * Reduce binary size by using 16bits integers in static data over 32 bits.Thierry Bastian2009-06-081-23/+18
| | | | | | | | Reviewed-by: ogoffart
| * Reduce the members in QLocale to 16bit integer instea of 32 bits.Thierry Bastian2009-06-081-19/+19
| | | | | | | | | | | | That reduces memory usage. Reviewed-by: denis
| * Clip region to screen coordinates before setting its component rectangles dirty.Alex Cucos2009-06-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | When using Qt/E with VNC screen driver on top of the Linux framebuffer (export QWS_DISPLAY="VNC:LinuxFb") the region to be exposed needs be clipped to the real screen to avoid possible negative coordinates which in turn cause access to invalid memory locations when comparing the content of the VNC buffer with the Linux framebuffer. Merge-request: 603 Reviewed-by: Tom Cooksey <thomas.cooksey@nokia.com>
| * Small simplification on codeThierry Bastian2009-06-086-46/+35
| |
* | Doc: Fixed QWebPage::forwardUnsupportedContent documentation and addedDavid Boddie2009-06-093-11/+22
|/ | | | | | more information about Web plugins. Reviewed-by: Trust Me
* Fixed ListView so that it is able to move items in negative space andThierry Bastian2009-06-081-1/+1
| | | | | | | | | still paint them. The autotest is included. Task-number: 254449 Reviewed-by: ogoffart
* small code cleanupThierry Bastian2009-06-081-7/+1
|
* Small fix to exported symbolThierry Bastian2009-06-081-1/+1
|
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtOswald Buddenhagen2009-06-081-1/+2
|\
| * Fix GDI object leak.Prasanth Ullattil2009-06-081-1/+2
| | | | | | | | | | | | | | In case the SetWindowRgn() fails, the region object has to be deleted. Task-number: 251293 Reviewed-by: Denis Dzyubenko
* | Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-0813-86/+328
|\ \ | |/ |/| | | | | | | | | | | Conflicts: src/3rdparty/phonon/qt7/mediaobject.mm src/3rdparty/phonon/qt7/quicktimevideoplayer.mm src/gui/text/qfontengine_win.cpp tools/linguist/shared/cpp.cpp
| * Mac: play music from CD does not work in PhononRichard Moe Gustavsen2009-06-086-83/+313
| | | | | | | | | | | | ...because it was never implemented. This patch does that. Task-number: 255377
| * Doc typo fix in QSslSocketMarkus Goetz2009-06-081-1/+1
| | | | | | | | Reviewed-by: TrustMe
| * Set the error to be HostUnreacheable if WSAEHOSTUNREACH is recievedAndy Shaw2009-06-081-0/+5
| | | | | | | | | | | | | | This was a contribution sent via the public bugs channel. Task-number: 255161 Reviewed-by: Marius Storm-Olsen
| * Fixed an issue with graphicssystem raster on 8 and 16 bit X servers.Trond Kjernåsen2009-06-051-1/+1
| | | | | | | | | | | | | | | | | | | | We didn't actually check the depth of the target window before calling the qt_x11_drawImage() fu, that will only work with depths >= 24. Task-number: 255311 Reviewed-by: Samuel BT: yes
| * Revert "BT: Fixed crash on Mac caused by erroneous handling of native focus ↵jasplin2009-06-051-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | events." This reverts commit 7314c07a3e443b1d5349b419a03db8d41ca43f7e. As reported by Eike, this patch caused several problems for Qt Creator. Potentially it may cause problems for other (external) applications as well. An alternative fix (scheduled for 4.5.x) needs to be found for tasks 254456 and 254460. Reviewed-by: Richard Moe Gustavsen
| * Example MDI: keybord focus not working correctly!Richard Moe Gustavsen2009-06-051-1/+7
| | | | | | | | | | | | | | | | | | The reason is that cocoa looses the first responder when we raise the fake window inside the MDA area. So we need to re-set the first responder again Task-number: 255040 Reviewed-by: Trenton Schulz
| * Fixed text drawing on Windows in 16 bit mode.Trond Kjernaasen2009-06-052-13/+16
| | | | | | | | | | | | | | | | | | | | | | There were several problems with antialiased text in 16 bit mode under Windows. No gamma correction was done, yet we prepared the cached glyphs for gamma correction. The mask format we rendered the glyphs into was also set to the desktop depth, which implied that information was lost and the text looked rather odd. Reviewed-by: Samuel BT: yes
| * Make sure to retain alpha information in copyAnders Bakken2009-06-041-3/+4
| | | | | | | | | | | | We need to set alpha to the right value when copying pixmaps. Reviewed-by: Donald <qt-info@nokia.com>
* | Revert signal emission order in QTextDocument to 4.5 behaviourmae2009-06-082-3/+11
| | | | | | | | | | | | | | This is covered by the autotest tst_QTextDocument::receiveCursorPositionChangedAfterContentsChange() Reviewed-by: con
* | Made QTreeWidgetItem::operator<() check if the data is numerical when comparing.J-P Nurmi2009-06-082-3/+31
| | | | | | | | | | | | | | More information in task 166873. Merge-request: 514 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* | Fix QT_NO_DATASTREAM macro checks and improve readabilityRitt Konstantin2009-06-0830-33/+59
| | | | | | | | | | | | | | | | Some checks where in the wrong locations, and some endifs where hard to read. Merge-request: 611 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
* | Make QCharRef known to QStringBuilder.hjk2009-06-082-4/+14
| |
* | make moc-generated code compile againKent Hansen2009-06-081-0/+2
| | | | | | | | Needed due to commit 4acabb3abd0ff109b9abeedb6832f5b1c3e0cc4e
* | make signal handlers understand QVariant againKent Hansen2009-06-051-3/+18
| | | | | | | | | | | | Also, issue a warning if a type is not known to the meta-type system. Task-number: 248129
* | have QScriptValue::toVariant() convert Array objects to QVariantListsKent Hansen2009-06-052-0/+3
| | | | | | | | | | | | | | Converting the array to its string representation is not very useful. Now round-trip conversion will work as well. Reviewed-by: Ariya Hidayat
* | Revert two of my commits, restoring the original fix for focus handling.Denis Dzyubenko2009-06-051-12/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix that was introduced adds regressions, and I don't see a way we can fix it without breaking someone elses code. So restoring the original fix that just avoid a crash (autotest by Thierry is included). Revert "Revert Avoid a crash when setting a focus in a widget hierarchy containing" Revert "Setting a focus on a widget hierarchy which contains both visible and invisible widgets could cause a crash." This reverts commit be833a4f25a8ec8c3dd7a8ac4fa4b0507c93e7ee. This partially reverts commit 1a7da7096bbda17197738061902f4489af234bc0 Reviewed-by: Thierry Bastian Reviewed-by: Prasanth Ullattil
* | QNetworkAccessManager: forgot the "since" tag in my previous commitPeter Hartmann2009-06-051-0/+2
| | | | | | | | Reviewed-by: trustMe
* | add HTTP DELETE support to Network Access APIPeter Hartmann2009-06-053-2/+29
| | | | | | | | | | | | | | | | | | added new method QNetworkAccessManager::deleteResource (naming the method "delete" was not possible since it is a reserverd word in C++) and adjusted all the internals necessary. Task-number: 242916 Reviewed-by: Thiago
* | Compilefix for QT_NO_CURSOR in qgraphicsscene.cppThomas Hartmann2009-06-051-0/+2
| | | | | | | | Reviewed-by: Joerg
* | Fixes anti-aliased text rendering on smartphones (Windows Mobile)Thomas Hartmann2009-06-052-2/+14
| | | | | | | | | | | | | | | | | | | | | | The check for cleartype in qt_win_read_cleartype_settings() was not correct for Windows Mobile For anti-aliased text rendering we also have to use another pixel format for the native image. Task-number: 249642 Reviewed-by: mauricek
* | kill dead codeKent Hansen2009-06-051-2/+0
| |