summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* 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
* skip tst_qscriptdebugger on Windows CE < 6Joerg Bornemann2009-09-091-0/+19
| | | | | | Currently the QScriptEngineDebugger uses far too much memory. Until task 261062 is resolved, we skip these test cases. Discussed with Kent.
* 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
* Do not run the respectHFW autotest on all platforms.Jan-Arve Sæther2009-09-091-0/+4
| | | | | | | | It fails on some platforms because of a bug in the autotest. There might be more platforms also, but these are the ones that currently report the problem. Reviewed-by: paul
* Stabilized QTableView testGabriel de Dietrich2009-09-091-1/+1
| | | | This test would crash once in while.
* Stabilize QFontMetrics testGabriel de Dietrich2009-09-091-3/+3
| | | | Reviewed-by: Olivier
* Added a standard copyright header to files generated by rcc.Martin Smith2009-09-091-0/+40
|
* Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Janne Anttila2009-09-093-3/+4
|\
| * tst_qhostinfo: Increased timeoutMarkus Goetz2009-09-091-1/+1
| |
| * Add missing \since 4.6 in the QMargins documentationOlivier Goffart2009-09-091-0/+1
| |
| * Stabilize QFontMetrics testOlivier Goffart2009-09-091-2/+2
| |
* | Added #ifdef Q_OS_SYMBIAN quard for ealier commit d78717e7Janne Anttila2009-09-091-2/+12
|/
* 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 the headers autotest for the latest LPGL header.Martin Smith2009-09-091-2/+3
| | | | The resource compiler still generates files that don't have the LPGL header.
* demos/embedded/anomaly compile fix for non-RTTI settingsJoerg Bornemann2009-09-091-10/+18
| | | | | Reviewed-by: mauricek Reviewed-by: thartman
* Fix for tst_QThread::adoptedThreadAffinity() failure on WindowsPrasanth Ullattil2009-09-091-9/+12
| | | | | | | | beginthread() is not reliable when the new thread exits fast. So we are changing this to use _beginthreadex() instead. Reviewed-by: Trond Reviewed-by: Bradley T. Hughes
* Fixed all but one of the failures in the headers autotest.Martin Smith2009-09-093-6/+7
| | | | The resource compiler still generates files that don't have the LPGL header.
* Getting text widget OOM tests working in Symbianmread2009-09-092-5/+9
| | | | | | | | | | | | | | 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-099-27/+53
|\
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-09-093-4/+4
| |\
| | * More robust graphicsview testOlivier Goffart2009-09-091-3/+1
| | |
| | * 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
| | * Tweak the testPaul Olav Tvete2009-09-091-0/+1
| | | | | | | | | | | | | | | | | | Give it another spin through the event loop, to make sure that all the painting gets done. (This is not connected to the glib timer event test failure.)
| * | 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-098842-37541/+38797
| |\ \ | | |/ | | | | | | | | | | | | | | | 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
| | * Remove duplicate setFBO calls introduced by QGLPaintDevice mergeTom Cooksey2009-09-091-2/+0
| | | | | | | | | | | | Reviewed-by: Trustme
| | * Try to fix tst_q3popupmenu with slow windows managerOlivier Goffart2009-09-091-6/+4
| | |
| * | Fixed y-inversion of pixmap drawing on gl graphics systemGunnar Sletta2009-09-095-12/+29
| | | | | | | | | | | | Reviewed-by: Trond
* | | Resolved ordinals for Qt/4.6 added OpenSSL symbols for Symbian OS.Janne Anttila2009-09-091-0/+2
| | | | | | | | | | | | | | | This fix gets rid of warnings/errors such as: QWARN : cannot call unresolved function sk_pop_free
* | | Fix for E32User-Cbase 69 panic, when runnign QtNetwork autotestsJanne Anttila2009-09-091-7/+16
| |/ |/| | | | | Reviewed-by: Janne Koskinen
* | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Janne Anttila2009-09-0932-298/+347
|\ \
| * | Make the QGraphicsViews more rebost regarding slow window managerOlivier Goffart2009-09-094-25/+41
| | |
| * | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Janne Anttila2009-09-098819-37165/+37498
| |\ \
generated by cgit v0.12 at 2025-08-17 07:37:51 (GMT)