summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixing the compile bug for Symbian when using ARMV5Aleksandar Sasha Babic2009-10-072-0/+5
| | | | | | | Explicit destructor was needed by compiler. Reviewed-by: Thiago Macieira (cherry picked from commit 15e2ecda958868b5c372bcd59cba8065c086581e)
* Made depth tested renderText() work after stencil clipping change.Samuel Rødal2009-10-071-7/+10
| | | | | Also we should force Raster_A8 glyph format in renderText(). (cherry picked from commit 9dbcdc00239abbaf899f04fc5ecc2bdb885ad08d)
* Added convex polygon optimization to QGL2PaintEngineExPrivate::fill().Samuel Rødal2009-10-071-5/+4
| | | | (cherry picked from commit d846af0de2ee2b3b76f81f2c0fd3ccceb645b511)
* Switched to using stencil instead of depth buffer for clipping.Samuel Rødal2009-10-072-121/+173
| | | | | | Based on Aaron Kennedy's patch. All tests are green, but when enabling scissoring UniteClip seems to be broken atm. (cherry picked from commit 6b623c04060d274c048c0d4c6dbc5a90d1c31604)
* Moved GL 2 clip clearing code into a common function.Samuel Rødal2009-10-072-14/+15
| | | | (cherry picked from commit 6d17e09c274803d324e8a8db579aaafaefaab33f)
* Got rid of some redundant state changes regarding GL depth state.Samuel Rødal2009-10-071-14/+9
| | | | (cherry picked from commit a815840a7f2272b128de4a52497626c49373c8c9)
* Renamed GL 2 engine variables to be clip buffer agnostic.Samuel Rødal2009-10-072-52/+52
| | | | (cherry picked from commit e8c73ac916ce5cb0492c1d1ba817e59b8df34158)
* Switched to using GL_LEQUAL instead of GL_LESS in GL 2 engine.Samuel Rødal2009-10-071-10/+11
| | | | (cherry picked from commit 2f268b40b290c4513d2d06b75ad681b5550eeaa8)
* Made GL 2 paint engine waste less bits in clipping algorithm.Samuel Rødal2009-10-071-5/+4
| | | | (cherry picked from commit aaf695a3fad8d84f3d9483a573732350445d453a)
* Refactored GL 2 engine UniteClip to always increase max depth.Samuel Rødal2009-10-071-3/+2
| | | | (cherry picked from commit af8ff76bf25b6b4d01d89bea42baab65ed7e09ea)
* Moved maxDepth out of state object and got rid of unused state members.Samuel Rødal2009-10-072-14/+9
| | | | (cherry picked from commit 6372c2865ab6924127b78f968bdd41f8d3f9c637)
* Fixed missing stencil buffer clear when scissor testing is disabled.Samuel Rødal2009-10-071-1/+3
| | | | (cherry picked from commit e8a3b49d6d42b213fd4fd55837f6180935a8a603)
* add missing includeKent Hansen2009-10-071-0/+1
| | | | | Necessary since the SignalEvent class was moved to qstatemachine.h. (cherry picked from commit cbc2508fc8cb0f16a061f778f777f8363640fcc8)
* Fixed some projective transform rendering bugs on qreal=float platforms.Samuel Rødal2009-10-071-1/+1
| | | | | | | | We should set the near clip slightly higher when qreal is float to avoid numerical precision problems. Reviewed-by: Trond (cherry picked from commit addc0cbdbe21da27f7ad9f0ee05a16e24afa392d)
* Fixed bug in GL 2 engine when using beginNativePainting.Samuel Rødal2009-10-071-0/+2
| | | | | | | | Need to set shader manager to dirty in case we change the shader program using native calls. Reviewed-by: Trond (cherry picked from commit 283670c8fbdda2898879066c7e14d3b0cb5ef442)
* compile without QT3SUPPORTJoerg Bornemann2009-10-071-0/+2
| | | | | Reviewed-by: thartman (cherry picked from commit 971adae01406f71ed9f0bb9cb2be5eddc259e77e)
* QAbstractSocket::setSocketOption: Make const referenceMarkus Goetz2009-10-072-3/+3
| | | | | | | After 4.6 API review. Reviewed-by: Volker Hilsheimer (cherry picked from commit f83ae188edb09a94b25b962c8a8b793180d22b67)
* tst_QGraphicsView::task245469_itemsAtPointWithClip Windows mobile fixJoerg Bornemann2009-10-071-0/+1
| | | | | | | | | We must make sure that the graphics view scene is centered to make this test work. On Windows mobile, the widget was too wide and the scene wasn't centered. Reviewed-by: thartman (cherry picked from commit 1627b135a7ec37862d7e3764fd545e75ca38bfd7)
* tst_QGraphicsLinearLayout::layoutDirection fixed for Windows mobileJoerg Bornemann2009-10-071-0/+2
| | | | | | | | This test depends on a layout spacing set to 6. The Windows mobile style has layout spacing 8. Reviewed-by: mauricek (cherry picked from commit ad52b10726aa72c253e220c06d3c7c76ef76366e)
* tst_qnetworkreply: Add ioPostToHttpsUploadProgressMarkus Goetz2009-10-073-0/+143
| | | | | | | Add a currently failing testcase. Related to task 261806 and others. Reviewed-by: Peter Hartmann (cherry picked from commit 6bbe0f3105fb8ec70aeb0952bec671b72b9f5400)
* Fix crash in QPlainTextEdit when using large fontsEskil Abrahamsen Blomfeldt2009-10-071-0/+3
| | | | | | | | | | | When using very large fonts, sometimes the scrollbar of the QPlainTextEdit will allow you to do scroll down past the end of the document, in which case the currentBlock in hitTest() is inValid() which caused an assert in currentBlock.next(). Task-number: QT-938 Reviewed-by: mae (cherry picked from commit d824af2348d11a7f364a1046a704268830f35f13)
* Numerical issues on Windows CE caused some image comparisons to fail.ninerider2009-10-071-1/+8
| | | | | | | | | | On Windows CE and possibly Symbian some filtering and blending functions of the SVG renderer will alter different pixels in two otherwise apparently identical images. Until this is not addressed in the renderers an exact image comparison is not alsways successful. Reviewed-by: banana joe (cherry picked from commit ba4c0b0048bab894047bc363ef7f7a3e12ef4d02)
* Span update after row and column insertion and removal in QTableView.Gabriel de Dietrich2009-10-075-4/+792
| | | | | | | | | | The feature had not been implemented yet. Auto-test and benchmark included. As a bonus, single cell spans are no longer added to the span collection. Reviewed-by: Thierry Task-number: 245327 Task-number: QTBUG-3610 (cherry picked from commit 0d51611fa524091ddca3c6c11edb0eae8ffe3b02)
* Small doclet fixThomas Zander2009-10-071-3/+3
| | | | | Rev-By: Trust-Me (cherry picked from commit 6c14af1cdb02d1d6957ad23ec435e2b95dda5b4a)
* Fixed an assert occuring on X11 when destroying QPixmaps under GL.Trond Kjernåsen2009-10-071-2/+4
| | | | | | | | The cleanup code for the QX11PixmapData was called incorrectly for QGLPixmapData. Reviewed-by: Samuel (cherry picked from commit cb368e06bea269422efcbdbe8136d424b6ff5052)
* Corrected Qt logo colors.Alessandro Portale2009-10-071-7/+7
| | | | | | | | | Replaced the poisonous green by the 'official' one. Took the RGB values from the logos availiable at: http://qt.nokia.com/about/logos-for-download Reviewed-By: TrustMe (cherry picked from commit a6bf8c28a8b8792167f6c93a08e871376651ba1a)
* Changed wording on Symbian introduction doc.Miikka Heikkinen2009-10-071-2/+2
| | | | | | | | Executing "perl createpackage.pl" will only work in bin dir, so changed the wording a bit. Reviewed-by: Janne Anttila (cherry picked from commit 9c73671c3b917a2a6a22411fb17c46dfa5e21049)
* QParallelAnimationGroup: set the correct state for the animationsThierry Bastian2009-10-073-30/+194
| | | | | | | | There were cases (now covered by autotests) where the state of the animations could be wrong. Reviewed-by: janarve (cherry picked from commit 1f5afc4300d3d7e3063f4e2c80a280a5098717d1)
* The threshold for system basic timers has changed on windowsThierry Bastian2009-10-072-3/+7
| | | | | | | | | This breaks the animations in main window because dragging a dock widget when it is undocked creates another event loop and the Qt events are not processed any more. Reviewed-by: Trust Me (cherry picked from commit 9dcd06efae3e2d78ef402bf06e655e7e95550a39)
* Optimized window surfaces on X11 by not setting clip in the common case.Samuel Rødal2009-10-072-5/+13
| | | | | | | | We don't need to set a clip when the flush only contains a single region. Not setting the clip gives us a slight performance boost. Reviewed-by: Trond (cherry picked from commit 6a061c1b66de4048222ef49c3d34c3e424e2a6c8)
* doc: Fixed a qdoc command that was meant to add emphasisThorbjørn Lindeijer2009-10-071-1/+1
| | | | | It was creating another list item. (cherry picked from commit 590b9b0e7587494e110cc3c498ff69ddab6f7520)
* implement property getters&setters for setProperty(quint32) overloadKent Hansen2009-10-072-2/+31
| | | | | | | It's better that this works rather than asserts. Reviewed-by: Olivier Goffart (cherry picked from commit 13cf7c64acd1652bad90966e06464b35b84e9513)
* Only build demo-browser 32-bit if Qt was actually built 32-bitTor Arne Vestbø2009-10-071-2/+8
| | | | | | | Also, add same trick for PPC Reviewed-by: MortenS (cherry picked from commit a6ed1f886d323d68001e3e1b50efe064073691ea)
* Add support for XFCE desktop integrationJens Bache-Wiig2009-10-071-2/+7
| | | | | | | | | | | | | | XFCE essentially depends on gnome libraries and can use the same integration features we provide for GNOME. Hence we simply treat it as the GNOME desktop environment internally. We can now also use the DESKTOP_SESSION to reliably detect desktop environments since it has been properly standardized, instead of relying on window manager hacks for anything but a fallback. Task-number: QTBUG-4737 Reviewed-by: bhughes (cherry picked from commit 9956ef7fd66f5a0a2ebf9b810e5f6ffe3649cf20)
* Add GNOME implementation for native filesystem iconsJens Bache-Wiig2009-10-073-0/+72
| | | | | | | | | | | | This adds some code to support native filesystem icons on GNOME. It works by resolving gnome libs and gnome-vfs dynamically, hence we are explicitly running it on GNOME only and not KDE. Even if it would work there as well. We are planning on adding this functionality to the platform plugin as well. Task-number: QTBUG-2195 Reviewed-by: joao (cherry picked from commit 3d2ef8ab18dcf0b772d2f6ddeb5cf5295ca09db6)
* statemachine: implement cloning of a whole bunch more GUI eventsKent Hansen2009-10-072-202/+169
| | | | | | Now using QEventTransition with almost any type of event will actually work, instead of causing an assert. (cherry picked from commit cadad3fdc7f6de95979f5b5be070da0853c46ba4)
* Build the demo-browser 32-bit on Mac since there's no 64-bit FlashTor Arne Vestbø2009-10-071-0/+4
| | | | | Reviewed-by: Simon Hausmann (cherry picked from commit 1f47353f90f6e1a3122eee14b9011bdeb7c7a93f)
* Fix regression in QUrl: IPv6 hosts should be lowercased like in Qt-4.5.David Faure2009-10-072-0/+5
| | | | | | Merge-Request: 1709 Reviewed-By: Thiago Macieira <thiago.macieira@nokia.com> (cherry picked from commit 8c4eb2b62983ec09bdfb2bde2723df12ac4e00ef)
* Faster case-insensitive comparison to "file" in QUrl::toLocalFileDavid Faure2009-10-071-1/+1
| | | | | | Merge-Request: 1709 Reviewed-By: Thiago Macieira <thiago.macieira@nokia.com> (cherry picked from commit 914cae63fd9045b8ac5877a974551f29eec24d72)
* Stabilize QWaitCondition test.Olivier Goffart2009-10-071-4/+4
| | | | | | | Wait a little bit more for thread synchronization Reviewed-by: Brad (cherry picked from commit 7a8503d179e0f9afebb2ca57e824f1be61becf17)
* QtScript: Another crash fix on PowerPCOlivier Goffart2009-10-071-2/+1
| | | | | | | | | | | on 32bit PowerPC, the integer value and the pointer value are not in the same word leading to crash. So blindly casting between them lead to crashes. Use the new Register::withInt instead Reviewed-by: Kent Hansen (cherry picked from commit c8d2160f3aa9b6709874c9cf4a634a46728d6cc6)
* Autotest: add missing copyright attribution for tests copied fromThiago Macieira2009-10-071-0/+20
| | | | | kurltest (cherry picked from commit 65a101502bb04ea95110ce6e12a3848c790eb7a1)
* Prospective build fix for SolarisKent Hansen2009-10-071-1/+1
| | | | | "Error: "static WTF::TCMalloc_PageHeap::runScavengerThread(void*)" is expected to return a value." (cherry picked from commit 9225889d8958e71c8683df752ff2207c11334c9a)
* Autotest: disable the globalObjects test.Thiago Macieira2009-10-071-0/+1
| | | | | | We are not going to fix this in 4.5. I doubt we'll fix it in 4.6 either, so I'll reenable it for 4.7 only. (cherry picked from commit 7ed2e44c48ac625993cf33cdbb70f82b0a3cb1af)
* Updated JavaScriptCore from /home/khansen/dev/qtwebkit to ↵Kent Hansen2009-10-073-9/+6
| | | | | | jsc-for-qtscript-4.6-staging-06102009 ( 32d226eb14d44f80e9ec96d4ca2c595181eeeca3 ) (cherry picked from commit 72f1e06aa6238f55729c4f3606d06ad7d37fe6df)
* Unified and increased some lackey timeouts in systemsemaphore test.Janne Anttila2009-10-071-11/+10
| | | | | | | | In Symbian OS some timeouts needs to be higher ones, in order to test complete correctly. Reviewed-by: Miikka Heikkinen (cherry picked from commit e6fdab148b207b6e0cf9279b4b82578d95f021a9)
* Decrease tst_QThreadOnce::multipleThreads test num of thread for SymbianJanne Anttila2009-10-071-1/+1
| | | | | | | | | | | In Symbian OS the maximum number of thread per process depends on stack size. With default 8KB stack size you can have 128 threads, with 16KB stack size you can have 64 threads etc. Since all qt threads nowadays have maximum stack size, we need to decrease the amount of threads in this test. Reviewed-by: TrustMe (cherry picked from commit 56087f7ffa0c64c34f55cf24a24d9337592b6c23)
* Increased tst_QSharedMemory::simpleProcessProducerConsumer timout.Janne Anttila2009-10-071-1/+1
| | | | | | | | | Test fails sometimes in Symbian OS due to fact that lackey has not finished it's task in given time. Increase timeout to same value as used in waitForStarted statement. Reviewed-by: TrustMe (cherry picked from commit 501d0fc639e7ec9b26a102eac857123d86215ccf)
* Partially revert e58293b3b, re-adding the #ifdef for Qt 4.7Thiago Macieira2009-10-071-0/+4
| | | | (cherry picked from commit f1ea73bad48816222e192a95f8589493743f0c28)
* Fixed the X11 error output from the demos/boxes demo.Trond Kjernåsen2009-10-071-0/+5
| | | | | | | | | | After we started caching the current context internally, it revealed an old bug: when a QGLWidget is reparented under X11, it will get a new window id, but its context will still be bound to the old window, so we need to rebind it. Reviewed-by: Samuel (cherry picked from commit 6d56096ba0f88e25efd77072f58804dd1f160c0a)