summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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
* 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-103414-14631/+15227
|\
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-09-101-2/+7
| |\
| | * 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.
| * | 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
| * 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-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
| * Make QGraphicsSvgItem a QGraphicsObject.Alexis Menard2009-09-092-15/+11
| | | | | | | | | | | | | | | | | | | | This item was inheriting from QObject and QGraphicsItem so there is no point to not make it a QGraphicsObject. I have added some properties that was specific to this class, i.e. elementId. Reviewed-by: ogoffart Reviewed-by: andreas Reviewed-by: bnilsen
| * Fix incorrect fallback for icon themesJens Bache-Wiig2009-09-091-18/+19
| | | | | | | | | | | | | | | | | | When using themed icons, we incorrectly used the systemTheme as the fallback. This is not correct as the idea of the fallback was to use the generic "gnome" or "oxygen" themes if the proper theme was not available. Reviewed-by: joao
| * CompileAnders Bakken2009-09-091-1/+1
| | | | | | | | | | | | | | | | Partially revert 6715f2f29ae413b328243d8c3dbe15cfba51d33f struct QWSServerCleaner { ~QWSServerCleaner(); } is not a function. Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
| * Fix QtScript compilation against external JSC sourcesSimon Hausmann2009-09-091-9/+10
| | | | | | | | | | | | | | Print a message when doing so and don't re-define qmake functions that come from JavaScriptCore.pri. Reviewed-by: Trust me
| * Doc: Note that Netscape plugins are only available on desktop platforms.David Boddie2009-09-091-3/+6
| | | | | | | | | | Reviewed-by: Takumi Asaki Will-also-be-applied-to: 4.5
| * Fix crash (assert) in QTextDocumentmae2009-09-091-0/+2
| | | | | | | | | | | | | | | | | | | | | | When loading binary files as text, QTextCursor did not check for beginning and end of frame (QChar(0xfdd0) and QChar(0xfdd1)), while QTextDocument asserted that those characters were absent. The patch makes QTextCursor::insertText() treat frame bounderies like paragraph separators. Reviewed-by: ck
| * Account for right bearing in QFontMetrics::boundingRect(string)Eskil Abrahamsen Blomfeldt2009-09-091-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | QFontMetrics::boundingRect() that takes a string needs to account for the right bearing of the last glyph, as it is documented to be the rectangle that contains the pixels of the text. I've added a test for this, and fixed tst_QFontMetrics::elidedText() to use boundingRect() to find the actual width of the text drawn (width() will return the advance of the text, which is larger than the actual width of the pixels.) I've also fixed a small typo in the "len" -> "ilen". Reviewed-by: Simon Hausmann
| * Fixed text positioning in SVGs when using SVG fonts.Kim Motoyoshi Kalland2009-09-091-1/+1
| | | | | | | | | | Task-number: 260920 Reviewed-by: Trustme
| * Fix crash/bug in QGraphicsItem's subFocus handling.Andreas Aardal Hanssen2009-09-092-8/+14
| | | | | | | | | | | | | | | | Removes dangling subFocusItem pointers when changing focus after reparenting. This change also includes a mini-optimization when adding focusable items to an inactive scene. Reviewed-by: brad
| * Only active QGraphicsScenes can have active input focus.Andreas Aardal Hanssen2009-09-092-9/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change ensures that only active scenes can have active input focus items. If you try to set input focus on items that are in an inactive scene, these items will gain input focus only when the scene is activated. For scenes attached to a view, this change should only fix the bug that you could have a blinking line edit in a scene when the view is inactive, meaning you couldn't type into the line edit. For scenes that have no view, you now must activate the scene in order to give the items active input focus. This will affect those who use QGraphicsScene with custom key and focus handling. Reviewed-by: brad
| * Remove ItemAutoDetectsFocusProxy from QGraphicsItem.Andreas Aardal Hanssen2009-09-093-47/+4
| | | | | | | | | | | | | | | | | | | | | | | | This change partially reverts f68fed388dcdba6ab6dad3af4933bcd3aa123cf8, which was an attempt at getting FocusRealms working. Turns out this approach is wrong. The flag behaves badly when reparenting, and the feature conflicts with plain old setting focus. Discussed with Aaron; this change was already reverted in the kinetic-declarativeui branch. Reviewed-by: TrustMe
| * Make QtOpenGL link against EGL for OpenGL ESTom Cooksey2009-09-092-2/+10
| | | | | | | | | | | | | | | | | | | | Previously, QtOpenGL assumed that by linking against QtGui, it would automatically also be linked against EGL. However, this is no longer the case after 83940f25dba51a9942ab55ed8475fc7fc8a8da84 which makes sure only QtGui links against EGL and not other libs/apps linking against QtGui. Reviewed-by: Rhys Weatherley
| * Some unneeded semicolons lessAlessandro Portale2009-09-097-10/+10
| |
| * Removed some superfluous semicolonsAlessandro Portale2009-09-0910-13/+13
| | | | | | | | Reviewed-by: TrustMe
| * Fixed a bug in the GL1 engine when using a QBrush(Qt::NoBrush) as a pen.Trond Kjernåsen2009-09-091-1/+1
| | | | | | | | | | | | | | This bug was exposed by a change in the QSvg module, and it fixes the framebufferobject and pbuffers2 GL examples. Reviewed-by: Kim
| * Fix OpenGL ES 1.x after QGLPaintDevice refactorTom Cooksey2009-09-091-0/+7
| | | | | | | | | | | | QGLPixmapData needs to be #define'd out for OpenGL ES 1.x Reviewed-by: Trustme
| * Fix crash of QtScript on Mac OS XSimon Hausmann2009-09-091-2/+6
| | | | | | | | | | | | | | | | | | When compiling on 10.4 but running on 10.5 the flags passed to vm_map cause it to crash. For now fall back to the use of mmap() as allocator instead. Reviewed-by: Kent Hansen
| * Added a standard copyright header to files generated by rcc.Martin Smith2009-09-091-0/+40
| |
| * Add missing \since 4.6 in the QMargins documentationOlivier Goffart2009-09-091-0/+1
| |
| * QMenubar could popup a menu when undocking a toolbarThierry Bastian2009-09-091-5/+6
| | | | | | | | | | | | | | | | | | This is due to the fact that it receives a mousemoveevent. But as it doesn't receive a mousepress event, we can detect whether it should popup or not. Task-number: 260873 Reviewed-by: prasanth
| * Fix unresolved reference to q_sk_free with openssl 1.0Bernhard Rosenkraenzer2009-09-093-3/+10
| | | | | | | | | | | | | | Previous fix introduced an unresolved reference in the lib Merge-request: 1409 Reviewed-by: Peter Hartmann <peter.hartmann@trolltech.com>
| * Fix build with openssl 1.0.0 betasBernhard Rosenkraenzer2009-09-091-1/+2
| | | | | | | | | | | | | | | | | | The recent addition of sk_pop_free to src/network/ssl/qsslsocket_openssl_symbols.cpp broke the build with openssl 1.0.0 betas; this commit fixes it Merge-request: 1409 Reviewed-by: Peter Hartmann <peter.hartmann@trolltech.com>
| * Fix a possible crash when deleting the QMainWindow layoutThierry Bastian2009-09-091-1/+2
| | | | | | | | | | | | | | | | It can happen that an item is still a gap and could then be deleted twice. We now check that to avoid double deletion. Note: it doesn't fix the bug but avoids the crash. Task-number: 260873
| * Unable to access file means QFile::PermissionsErrorJoão Abecasis2009-09-091-1/+1
| | | | | | | | | | | | | | Relates to changes introduced in 6d87a01f2d3108bbee5b9995f20edfc26a01cd57. Reviewed-by: Marius Storm-Olsen
| * Fixed all but one of the failures in the headers autotest.Martin Smith2009-09-091-1/+1
| | | | | | | | The resource compiler still generates files that don't have the LPGL header.
| * Getting text widget OOM tests working in Symbianmread2009-09-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There is one actual bug fix, checking for null pointer return. The exception safety test code now initialises the fonts system. The S60 fonts system does not survive OOM testing without this. Otherwise some duplicate tests are removed and code tidied up. Reviewed-by: Liang Qi Reviewed-by: Harald Fernengel Reviewed-by: Alessandro Portale
| * Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Janne Anttila2009-09-096-18/+47
| |\
| | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-09-091-1/+2
| | |\
| | | * Fix crash in QtScript with exceptions.Simon Hausmann2009-09-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When trying to determine if there is a handler for an exception, determine the returnPC for the call frame traversal frmo the corrent CallFrame object. Reviewed-by: Kent Hansen
| | * | Made GL1 engine have proper y-rotation since qgldrawable refactorGunnar Sletta2009-09-092-10/+23
| | | | | | | | | | | | | | | | Reviewed-by: Tom
| | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-09-093423-14629/+15335
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: src/opengl/qgl.cpp src/opengl/qgl_p.h src/opengl/qpaintengine_opengl.cpp
| | | * Fix build breakage on Mac CarbonTom Cooksey2009-09-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | A new QGLFramebufferObject constructor was added after the QGLPaintDevice was branched which therefore didn't get patched. Reviewed-by: Trustme
generated by cgit v0.12 at 2025-01-24 04:34:21 (GMT)