summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixed gradient referencing in SVGs.Kim Motoyoshi Kalland2009-09-149-159/+135
| | | | | | | | An SVG element can now reference a gradient or solid-color defined anywhere in the same SVG file. Task-number: 245602 Reviewed-by: Trond
* Add filter strength to QGraphics[Colorize,Grayscale]Effect.Ariya Hidayat2009-09-144-1/+126
| | | | | Autotest: included Reviewed-by: Bjørn Erik Nilsen
* Add simple autotest for QGraphicsColorizeEffect.Ariya Hidayat2009-09-141-0/+25
| | | | Reviewed-by: Bjørn Erik Nilsen
* Add simple autotest for QGraphicsGrayscaleEffect.Ariya Hidayat2009-09-141-0/+24
| | | | Reviewed-by: Bjørn Erik Nilsen
* QSslCertificate autotest: allow test from shadow directoryPeter Hartmann2009-09-141-5/+0
| | | | Reviewed-by: TrustMe
* Really fixed clipping bug in portedcanvas with -graphicssystem opengl.Samuel Rødal2009-09-141-1/+1
| | | | | | | | Change c72eaee91136bbe1a9fa99cdb0a7593bec60264b was wrong, we should call ensureActive(), not syncState(). Task-number: 261113 Reviewed-by: Trond
* If the font does not exist, then the right bearing becomes to bigJørgen Lind2009-09-143-2/+5
| | | | | | | | | In the QPF1 engine if the font does not exist, then the default constructor of glyph_metrics_t is used which sets the x and y values to the unlikely value of 100000. These glyph_metrics_t instances are not suppose to be used in the text layout calculations. Task-number: pending
* Fixed clipping bug in GL 2 engine.Samuel Rødal2009-09-141-0/+1
| | | | | | | | | | | When dumping the rectangle clip to the depth buffer due to needing to intersect with a more complex clip, we didn't take into consideration that writeClip will transform the path by the current matrix, whereas the rectangle clip is in device coordinates. Thus, we need to map the path by the inverse matrix. Task-number: 260701 Reviewed-by: Trond
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Ariya Hidayat2009-09-141-5/+29
|\
| * System locale on Mac returns preferred language/country from sys prefs.con2009-09-141-5/+29
| | | | | | | | | | | | | | Previously it always returned the C locale's language, which is of not much help for an application. Reviewed-by: Morten Sorvig <msorvig@trolltech.com>
* | Add strength factor to the colorize filter.Ariya Hidayat2009-09-143-1/+94
| | | | | | | | | | | | | | | | | | | | | | To allow fading between the original and the colorized version of the pixmaps, a new strength factor is introduced, 0.0 means the filter has no effect at all, 1.0 means full colorization. Still missing is the non-raster implementation. Autotest: included Reviewed-by: Bjørn Erik Nilsen
* | Bring back the blurry drop shadow in the lighting example.Ariya Hidayat2009-09-141-1/+3
|/ | | | Reviewed-by: Bjørn Erik Nilsen
* Fixed clipping bug in portedcanvas with -graphicssystem openglSamuel Rødal2009-09-141-0/+3
| | | | | | | | | We need to call ensureActive() when save() is called, to make sure systemStateChanged() gets called and updates the scissorTestEnabled flag, so that we don't lose it on the next restore(). Task-number: 261113 Reviewed-by: Trond
* Ensured that we use GL 1 engine when -graphicssystem opengl1 is used.Samuel Rødal2009-09-141-1/+1
| | | | Reviewed-by: Trond
* Implement synthetic enter/leave events for QWS.Paul Olav Tvete2009-09-145-11/+32
| | | | | | | QWS uses alien widgets too, so we need the same logic as the other platforms. Reviewed-by: bnilsen
* Workaround QWS Enter/Leave problem.Paul Olav Tvete2009-09-141-0/+5
| | | | Reviewed-by: bnilsen
* API change. This will get rid of the ugly setAnchorSpacing() method.Jan-Arve Sæther2009-09-147-372/+393
| | | | | | | | | | | | | | | | | | | | Say hello to QGraphicsAnchor, move the spacing (and removeAnchor) functionality over to that class. This also opens up for a cleaner API when we add support for size policies or min/pref/max sizes for anchors. Also remove - addLeftAndRightAnchors() - addTopAndBottomAnchors() - addAllAnchors() in favor of - addAnchors(itemA, itemB, Qt::Orientations) API change discussed with Caio and Andreas. Reviewed-by: Alexis
* Fix QMenuBar hover effect.Olivier Goffart2009-09-141-3/+1
| | | | | | | Regression introduced by commit 21cf7b4c431742 Task-number: 261199 Reviewed-by: Prasanth
* Doc: Fixed grammar.David Boddie2009-09-141-1/+1
| | | | Reviewed-by: Trust Me
* Doc: Ongoing improvements.David Boddie2009-09-142-73/+84
| | | | Reviewed-by: Trust Me
* Fix RTL text alignment in QComboBox items with SH_ComboBox_PopupEskil Abrahamsen Blomfeldt2009-09-142-0/+42
| | | | | | | | | | | | | | Change 93ba0035f4eadfaf7217d95f18a442d418a064b8 removed truncation of a listview item's bounding rect to the viewport as documented in the commit log. An unwanted result was that the style option passed to the item delegates would sometimes contain a rectangle which was larger than the delegated area. The direct result was that a QComboBox drawn with a style with the SH_Combobox_Popup style hint in an RTL language would align its item text to the right edge of a rectangle which was wider than the popup menu, and thus only part of the text would be visible. Task-number: 260974 Reviewed-by: Olivier
* Fixed a typo found during translationJure Repinc2009-09-141-1/+1
|
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-09-143-2/+15
|\
| * Fix drawTiledPixmap for NPOT pixmaps on OpenGL ES 2.0Tom Cooksey2009-09-141-0/+12
| | | | | | | | | | | | | | | | | | OpenGL ES does not support GL_REPEAT wrap modes for NPOT textures. So instead, we emulate GL_REPEAT by only taking the fractional part of the texture coords in the fragment shader. Task-number: 260982 Reviewed-by: Samuel
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-09-145-11/+29
| |\
| | * Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-09-141-1/+1
| | |\
| | | * Fix libiconv support on FreeBSD.Raphael Kubo da Costa2009-09-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some reason iconv support was broken in Qt 4.5 on FreeBSD, and this patch was made to fix that. Original patch by Max Brazhnikov <makc@freebsd.org>. Original message: Enable libiconv support. Didn't get where the real problem is, but using UTF-16LE/BE as default encoding (see patch) fixes the issue. Merge-request: 1480 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * | | Fixed bad gradient offsets on Mac OS XGunnar Sletta2009-09-141-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an engine supports pixmap transformations natively, there will still be a redirection offset in the matrix even after calling resetMatrix(), so this is not enough, we need to set it to an actual identity. Reviewed-by: Trond
* | | | Don't call into paint engines when we don't have pens and brushesGunnar Sletta2009-09-141-2/+7
| | | | | | | | | | | | | | | | Reviewed-by: sroedal
* | | | Some small optimizations to gl2 engine.Gunnar Sletta2009-09-142-30/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use qpen_ and qbrush_ accessors for slightly better performance and avoid calling for the same value again and again. Secondly, the engine doesn't use its pen and brush states so there is no point in maintaining them, so don't reset old brush all the time. Reviewed-by: Samuel
* | | | Fixed crash in gl when stroking with a Qt::NoBrush penGunnar Sletta2009-09-141-1/+3
| |/ / |/| | | | | | | | Reviewed-by: Samuel
* | | Fixed groupbox drawing on xp when hitting the fallback code.Gunnar Sletta2009-09-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | When swapping the alphachannel we need to make sure we create proper premultiplied pixels. When setting alpha to 0, that means also setting the other pixel values to 0. This bug was made visible by the gl graphics system. Reviewed-by: MariusSO
* | | Fixed compilation of some ifdef'ed out debug messages.Gunnar Sletta2009-09-141-8/+13
| | | | | | | | | | | | Reviewed-by: trustme
* | | fix compile error debug outputGunnar Sletta2009-09-141-1/+1
| | |
* | | Autotest preventing gl from crashing on shutdown with dangling contextsGunnar Sletta2009-09-141-0/+13
|/ /
* | Performance: reduce TLS overhead of QGLContext::currentContext()Rhys Weatherley2009-09-148-64/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | The handling for the current QGLContext was looking up the same TLS data several times per call (hasLocalData() and localData() calls particularly). This change also refactors the code a little so that the setting of the QGLContext within makeCurrent() and doneCurrent() is in one location in the code instead of six (one per platform). Reviewed-by: Michael Brasser Reviewed-by: Sarah Smith
* | qdoc: QGLWidget::colormap() returns a QGLColormap, not a QColormapRhys Weatherley2009-09-141-2/+2
| |
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-09-148-46/+95
|\ \
| * \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Kurt Korbatits2009-09-14143-19978/+2570
| |\ \ | | | | | | | | | | | | | | | | Conflicts: examples/multimedia/audio/audiodevices/audiodevicesbase.ui
| * | | AudioDevices demo doesn't do anything on WindowsKurt Korbatits2009-09-148-276/+303
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -put example audiodevices in layout. -added more checking to testSettings() in win32 implementation. -disabled objects in example audiodevices that are not editable. -added more checking to alsa implementation for preferredFormat(). -changed internal strings from tr to QLatin1String. Reviewed-by:Justin Mcpherson
* | | | Use redF(), etc when setting GL colorsRhys Weatherley2009-09-141-5/+3
| | | | | | | | | | | | | | | | Reviewed-by: Sarah Smith
* | | | Don't have to glEnable(GL_TEXTURE_2D) when using shaders.Rhys Weatherley2009-09-141-4/+0
| |/ / |/| | | | | | | | | | | | | | | | | OpenGL/ES 2.0 systems were giving a GL error when GL_TEXTURE_2D was enabled and disabled. Reviewed-by: trustme
* | | qdoc: size of a QGLColormap is 256 on all platforms, not just WindowsRhys Weatherley2009-09-141-1/+1
| | |
* | | qdoc: QGLFormat documentation improvementsRhys Weatherley2009-09-141-5/+9
| | |
* | | qdoc: QGLWidgets -> QGLWidget, etc, for proper doc linking.Rhys Weatherley2009-09-132-12/+12
| | |
* | | qdoc: document default values for QGLFramebufferObject propertiesRhys Weatherley2009-09-131-9/+17
| | |
* | | QGLWidget::fontDisplayListBase() is not supported under OpenGL/ESRhys Weatherley2009-09-132-2/+10
| | | | | | | | | | | | | | | | | | Update documentation and #ifdef out the implementation. Reviewed-by: trustme
* | | qdoc: qglColor() doesn't work under OpenGL/ES 2.0Rhys Weatherley2009-09-131-0/+4
| | |
* | | Make QGLWidget::renderText() desktop onlyRhys Weatherley2009-09-131-175/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | The renderText() function is only for legacy desktop systems, so revert the previous attempts to port it to OpenGL/ES. Documentation note added to direct users to QPainter::drawText() for the correct way to render text onto an OpenGL paint device. Reviewed-by: trustme
* | | Fix compilation with QT_NO_CAST_FROM_BYTEARRAY.Till Adam2009-09-131-3/+3
| | | | | | | | | | | | | | | Merge-request: 1421 Reviewed-By: Thiago Macieira <thiago.macieira@nokia.com>