summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Re-order begin() so everything needing a current context has oneTom Cooksey2009-09-102-18/+14
| | | | | | | | | | | | It should be up to QGLPaintDevice::beginPaint() to make the correct context current, so everything needing a current context needs to be moved after that call. This patch also modifies QGLPixmapData to use QGLContext::drawTexture rather than the GL2 PE's drawTexture, which shouldn't be called inside beginPaint as the paint engine hasn't been fully initialised yet. Reviewed-by: Eskil
* Doc: Documented the standard keys in item views.Geir Vattekar2009-09-101-1/+39
| | | | | Task-number: 212278 Reviewed-by: David Boddie
* Doc: Fixed snippet bug in stylesheet docsGeir Vattekar2009-09-102-3/+3
| | | | | Task-number: 241222 Reviewed-by: Trust Me
* Update installation instructions for building for SymbianShane Kearns2009-09-102-1/+11
| | | | | | | | Add MinGW to list of tools people need to build the tools. Update RVCT version from 616->686 Include instructions for building with raptor Reviewed-by: Jason Barron
* Make test pass on QWSPaul Olav Tvete2009-09-101-0/+1
| | | | Reviewed-by: jbarron
* Fixed rendering of text with gradient pen in GL 2 engine.Samuel Rødal2009-09-101-5/+4
| | | | | | | | | We should bind the text mask texture after calling prepareForDraw(), since prepareForDraw() might need to initialize the gradient texture, which means the text mask will no longer be bound. Task-number: 261058 Reviewed-by: Kim
* Fixed crash in raster paint engine.Samuel Rødal2009-09-101-1/+1
| | | | | | | If m_element_types is empty then we should create a QVectorPath without element types as well. Reviewed-by: Gunnar
* Wrong opacity set on the painter in QGraphicsEffect::draw.Bjørn Erik Nilsen2009-09-102-1/+25
| | | | | | | | We have to initialize the painter with the 'effected' item's opacity before calling QGraphicsEffect::draw; otherwise we'll use the previous rendered item's opacity (which is wrong). Reviewed-by: Michael Brasser
* Fixed white-space handling in the SVG module.Kim Motoyoshi Kalland2009-09-101-10/+13
| | | | | | | | | When parsing lists, only space characters were treated as white-space. Now, carrige returns, line feeds and tabs are also treated as white- space as described in the SVG Tiny 1.2 specification. Task-number: 260799 Reviewed-by: Tor Arne
* Add an autotest for QGLWidget::renderPixmap()Tom Cooksey2009-09-101-0/+30
|
* Made raster respect SmoothPixmapTransform and Antialiasing hints better.Samuel Rødal2009-09-101-14/+5
| | | | | | | | SmoothPixmapTransform shouldn't imply Antialiasing for image / pixmap drawing, since the render hints are fully orthogonal. Task-number: 256967 Reviewed-by: Trond
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Iain2009-09-106-4/+18
|\
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Morten Sorvig2009-09-101-1/+1
| |\
| * | Enable Qt3Support for Qt/Cocoa on Mac OS X.Morten Sorvig2009-09-106-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt on Mac OS X should not be the only desktop platform without Qt3Support once the Carpon port is dropped. This will also make the switch from Carbon to Cocoa-based Qt as smooth as possible. This is a minimal port, with some code removed: Q3FileDialog is gone. Q3MainWindow won't get the "hide toolbar" button. Q3ScrollView might to more updates than structly neccesary. The rest is there, including the QT3_SUPPORT functions in QtCore and QtGui.
* | | Remove (out-of-date) DEF files for Symbian winscw build.Iain2009-09-109-19218/+0
| |/ |/| | | | | | | | | | | | | | | | | These hadn't been updated since they were frozen against Tower (or a build close to the one used for Tower) so they're out of date and therefore useless. They'll reappear when we have a DEF file strategy. RevBy: Jason Barron
* | Fix focus policy propagation in QCompleter on QWSPaul Olav Tvete2009-09-101-1/+1
|/ | | | | | | setParent(0) can change the focus policy, so let's retrieve the original value a bit earlier. Reviewed-by: jasplin
* Upload texturedata in matching internal format..Gunnar Sletta2009-09-101-12/+26
| | | | Reviewed-by: Tom
* Don't yinvert pixmaps on eglx11Gunnar Sletta2009-09-101-3/+0
| | | | Reviewed-by: Tom
* Fix random selection when the order is descending.Alexis Menard2009-09-104-22/+91
| | | | | | | | | | | | | | | This commit fix the random selection that appear when the sort is not ascending. The problem is that sometimes the sort is not yet made (timer is not yet fired) so the visible children list contains both sorted items and non sorted items (at the end). translateVisibleLocation was buggy assuming that the list is always sorted. We have now a dirty index that indicate where the dirty items start. And then when the sort is made the dirty index is reset. I have added auto-test for that and fix one that was broken for Mac. The new version of the auto-test showed a crash because of this broken selection. Task-number:258751 Reviewed-by:thierry
* Fix crash in gl2 paint engine on WindowsEskil Abrahamsen Blomfeldt2009-09-101-1/+3
| | | | | | | | | | | wglGetProcAddress() on Windows requires a current context. Since there was none, the resolution of GL extensions would silently fail, the function pointers would be null and when we tried to use them later we would get a crash (e.g. in startup of PadNavigator.) I've added an assert to make the cause of the crash clearer, and a makeCurrent() to fix the crash. Reviewed-by: Tom
* Stabilize Graphics View testsOlivier Goffart2009-09-103-48/+93
| | | | Reviewed-by: Jesper
* Stabilize some tests.Olivier Goffart2009-09-103-4/+8
| | | | | | | For the QFontMetrics test, the different way of computing the with of a text returs different value (1 to 2 pixel difference). So we need to make sure to use the same way to compute the with that the one used to ellide.
* Fixed handling of stop-color="currentColor" in the SVG module.Kim Motoyoshi Kalland2009-09-102-14/+31
| | | | | | | The 'color' attribute is now explicitly parsed for gradient nodes. Task-number: 260921 Reviewed-by: Trond
* Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Miikka Heikkinen2009-09-108819-36756/+38199
|\
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Morten Sorvig2009-09-107-243/+269
| |\
| | * Autotest fix for QMainWindowThierry Bastian2009-09-101-2/+6
| | | | | | | | | | | | | | | On embedded, the size of the screen is too small to leave enough space for the dock widgets.
| | * Add a layout in the demo it looks better.Alexis Menard2009-09-101-233/+211
| | | | | | | | | | | | Reviewed-by:jan-arve
| | * Make exception safety test work with XML output and warningsmread2009-09-101-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QTestLib XML output system throws exceptions when the system is out of memory, which is normally quite reasonable. However when it is used to report warnings during a catch block, this terminates the program. So this change temporarily disables allocation failures while the warning is being recorded. Reviewed-by: Jason Barron
| | * CompilePaul Olav Tvete2009-09-101-2/+8
| | | | | | | | | | | | Reviewed-by: Jeremy Katz
| | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-09-104-0/+190
| | |\
| | * \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-09-101-2/+7
| | |\ \
| | * | | Return the correct QGLFormat to the OpenGL1 paint engine for FBO'sRhys Weatherley2009-09-103-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGLPaintDevice::format() was returning the context's format, not the format of the window surface's FBO. This caused the OpenGL1 paint engine to think that the window didn't have depth and stencil buffers, even though the FBO most certainly did. This change makes QGLPaintDevice::format() virtual and overrides it in QGLFBOGLPaintDevice to return an updated format that includes the context parameters plus the extra features that the FBO supports. Reviewed-by: Tom Cooksey
| * | | | Make static builds work fot Qt/Cocoa.Morten Sorvig2009-09-102-0/+8
| | |_|/ | |/| | | | | | | | | | | | | | Add -all_load to make Objective-C categories work. Enable hide_symbols to remove visibility issues.
| * | | Add a mkspec for selecting gcc-4.0 on Mac OS X.Morten Sorvig2009-09-104-0/+190
| | |/ | |/| | | | | | | This has one known use case: compiling with the 10.4u SDKi on 10.6.
| * | Fixed crash on shutdown with GL when leaking QGLWidgetsGunnar Sletta2009-09-101-2/+7
| |/ | | | | | | | | | | | | | | The problem was the QGLContextResource destructor which was called when the QtOpenGL dll was unloaded. At this point in time, the gl driver had already been unloaded so any gl calls at this point in time would crash. It is simply wrong for the destructor to try to clean up, so we instead output a warning if resources are leaked.
| * Fixed tst_selftests failure.Rohan McGovern2009-09-101-6/+6
| | | | | | | | | | It's acceptable for the exceptionthrow test to output: terminate called after throwing an instance of `int'
| * Fix a bug with mouse events in DirectFBAnders Bakken2009-09-101-0/+14
| | | | | | | | | | | | | | | | Partially revert a974ce81d6324d8d85ade0153b5ce7c757ba4fdf. It seems odd to just ignore the actual data in the input event but when the layer and the event differs the layer is correct. Reviewed-by: TrustMe
| * DWDESC_OPTIONS was added for DirectFB 1.1Anders Bakken2009-09-101-1/+4
| | | | | | | | Reviewed-by: TrustMe
| * s/DIRECTFB_MINOR_VERION/DIRECTFB_MINOR_VERSION/Anders Bakken2009-09-101-1/+1
| | | | | | | | | | | | This will make DirectFB version tests work. Reviewed-by: TrustMe
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-09-101-2/+2
| |\
| | * Fixes another SQL Server autotest result.Bill King2009-09-101-2/+2
| | |
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-09-101-1/+1
| |\ \ | | |/
| | * Use fromLatin1() in QDirectFBScreen::connect()Anders Bakken2009-09-091-1/+1
| | | | | | | | | | | | | | | | | | Avoid warning when building DirectFB as part of Qt. Reviewed-by: TrustMe
| * | Fix font glyph handling for QPF fonts in the OpenGL1 paint engine.Rhys Weatherley2009-09-101-1/+18
| |/ | | | | | | | | | | | | | | | | Text drawing on OpenGL/ES 1.1 systems using QPF was displaying filled boxes in place of the character glyphs. This is due to the QPF implementation of alphaMapForGlyph() returning a different color table than that expected by QGLGlyphCache::cacheGlyphs(). Reviewed-by: Sarah Smith
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-09-094-12/+70
| |\
| | * Crash in audiooutput demo when switching outputKurt Korbatits2009-09-094-12/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -waveOut callback was calling into class during destruction. Changed to wait until close of waveOut/waveIn before returning from destructor. -Reduced default buffer on wince implementation. -Added error checking on buffer allocation. Task-number:261049, 261053 Reviewed-by:Bill King
| * | Compile fix for OpenGL/ES 1.1 CommonLite systemsRhys Weatherley2009-09-091-0/+4
| | | | | | | | | | | | Reviewed-by: trustme
| * | Suppress warnings in QtOpenGL on OpenGL/ES 1.1 systemsRhys Weatherley2009-09-093-4/+10
| |/ | | | | | | Reviewed-by: trustme
| * Compile fix for OpenGL/ES 1.1 systemsRhys Weatherley2009-09-091-0/+1
| | | | | | | | Reviewed-by: trustme
| * Document why an FBO of 0 needs to be bound in QGLPaintBuffer sometimesRhys Weatherley2009-09-091-0/+6
| | | | | | | | Reviewed-by: trustme