summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |\ \
| | * | Fix the bactkrace in the QScript DebuggerOlivier Goffart2009-09-093-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch remove the 'fake' context that appears in the debugger backtrace when there is a break point in the global context. This problem never appeared in the tests because the QScriptContext::backtrace has always at least two items in the backtrace as it needs the native 'bt' function to be called. Changed QScriptEnginePrivate::contextForFrame to skip the fake frame (instead of QScriptContext::parentContext). So we never have a QScriptContext pointing to that frame. The changes in QScriptContextInfo are for retreiving the right filename information for the global context when the global context is on top. Reviewed-by: Kent Hansen
| | * | Fix crash on QGraphicsItem destruction related to focus handling (redone)Kai Koehne2009-09-091-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reset the dangling subFocusItem pointer in ~QGraphicsItem, after all the child items have been deleted. This replaces commit d724c91a0ae. Reviewed-by: Thomas Hartmann
| | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-09-098795-35167/+35495
| | |\ \
| | | * \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jason McDonald2009-09-092-35/+59
| | | |\ \
| | | * \ \ Merge branch '4.5' into 4.6Jason McDonald2009-09-091-0/+2
| | | |\ \ \
| | | | * | | Make configure show the correct license namefor tech previews.Jason McDonald2009-09-091-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: 261031 Reviewed-by: Trust Me
| | * | | | | Clean up shader programs properlyRhys Weatherley2009-09-094-191/+232
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGLShader and QGLShaderProgram used to delete the GL object id in the wrong context. But fixing this means we must keep track of when contexts are destroyed so that we don't try to access a context from a shader if it goes away. We also need to transfer ownership from one context to another when they are shared. This change introduces QGLSharedResourceGuard, which keeps track of a context and a GL object identifier. When the context goes away, ownership is passed to a shared context. When there are no more shared contexts, the identifier automatically zeroes. Reviewed-by: trustme
| * | | | | | Fixed 'use of function XXX is deprecated' warning reported by RVCT.Janne Anttila2009-09-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: 241223
| * | | | | | Took armcc_warnings.prf in use also for uitools build.Janne Anttila2009-09-091-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | armcc_warnings.prf suppresses warnings for some common patterns used in Qt. Since armcc_warnings.prf is already used when compiling the libraries from src folder, it is should be ok to use it also for libraries under tools folder. Task-number: Reviewed-by: TrustMe
| * | | | | | Fixes for compiler warnings reported by RVCTJanne Anttila2009-09-095-28/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: 241223 Reviewed-by: Janne Koskinen
| * | | | | | Fixed 'use of function is deprecated' warnings reported by RVCTJanne Anttila2009-09-097-23/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: 241223 Reviewed-by: Janne Koskinen
| * | | | | | Fixed compiler warnings for RVCT compiler.Janne Anttila2009-09-092-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When compiling libmng for RVCT the following compiler warnings were reported: - #177-D: variable "pTemp" was declared but never referenced - #14-D: extra text after expected end of preprocessing directive This fix delays the pTemp declaration, until they are needed inside used for example in 'mng_create_imagedataobject' function. For 'extra text after expected end of preprocessing directive' warning the fix is to use: #endif /* MNG_SUPPORT_WRITE */ Instead of: #endif MNG_SUPPORT_WRITE Task-number: 241223 Reviewed-by: Espen Riskedal
| * | | | | | Fixed 'illegal empty declaration' warning reported by Nokia X86 compilerJanne Anttila2009-09-082-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: 241223 Reviewed-by: TrustMe
generated by cgit v0.12 at 2025-09-13 10:39:39 (GMT)