summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * 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>
| * Doc: First part of my review of the gestures overview.David Boddie2009-09-092-26/+92
| | | | | | | | Reviewed-by: Trust Me
| * 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
| * tests/auto/qfiledialog/qfiledialog.pro fixedJoerg Bornemann2009-09-091-3/+3
| | | | | | | | Reviewed-by: thartman
| * tests/auto/qdirmodel/qdirmodel.pro fixedJoerg Bornemann2009-09-091-2/+2
| | | | | | | | Reviewed-by: thartman
| * tests/auto/qfile/test/test.pro fixedJoerg Bornemann2009-09-091-4/+4
| | | | | | | | Reviewed-by: thartman
| * tests/auto/qdir/qdir.pro fixed after destroying it during Symbian mergeJoerg Bornemann2009-09-091-12/+8
| | | | | | | | Reviewed-by: thartman
| * Doc: Updated the license information for Phonon.David Boddie2009-09-091-2/+4
| | | | | | | | | | Reviewed-by: Trust Me Really-reviewed-by: Legal
| * 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-092-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | 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-093-8/+25
| | | | | | | | | | | | | | | | 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-097-29/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-094-118/+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
| * Updated the pbuffers2 example to make it work with the GL2 engine.Kim Motoyoshi Kalland2009-09-091-0/+2
| | | | | | | | | | | | Added begin/endNativePainting() calls. Reviewed-by: Trond
generated by cgit v0.12 at 2024-11-10 15:56:17 (GMT)