summaryrefslogtreecommitdiffstats
path: root/tests/auto/qglthreads
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-011-1/+1
|\ | | | | | | | | | | Conflicts: mkspecs/features/symbian/application_icon.prf src/sql/drivers/odbc/qsql_odbc.cpp
| * Fix typo in qglthreads auto test.Jani Hautakangas2011-01-281-1/+1
| | | | | | | | Reviewed-by: TRUSTME
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-172-4/+20
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| * Fix qglthreads test crash on SymbianJani Hautakangas2011-01-121-2/+18
| | | | | | | | | | | | | | | | | | | | Use less GPU memory to make tests pass and skip threaded rendering since eventually tries to access main RWindow from secondary thread, which is not allowed on Symbian Task-number: QTBUG-13525 Reviewed-by: TRUSTME
| * Update copyright year to 2011.Jason McDonald2011-01-102-2/+2
| | | | | | | | Reviewed-by: Trust Me
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-071-0/+5
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp qmake/generators/win32/msbuild_objectmodel.h qmake/generators/win32/msvc_objectmodel.cpp qmake/generators/win32/msvc_vcxproj.cpp src/corelib/arch/qatomic_arm.h tests/auto/qglthreads/tst_qglthreads.cpp
| * Fix gcc compilation problems in QtOpenGL. Actually was typo andJani Hautakangas2010-10-041-0/+5
| | | | | | | | | | | | for some reason rvct didn't catch that. Reviewed-by: TRUSTME
* | Added basic tests for threaded QPainter drawing onto FBOs and PBOs.Trond Kjernåsen2010-09-092-21/+141
| | | | | | | | | | | | | | | | I've noticed that under Windows we get some wglMakeCurrent() failed messages in the QGLWidget, QGLPixelBuffer and QGLFrameBufferObject tests when deleting the painter or device wrappers used in the threading tests. It's currently unknown why this happens, as both the contexts and devices are valid at that point.
* | Add some comments to the new tests.Trond Kjernåsen2010-08-251-1/+13
| |
* | Rework some of the threaded tests a bit.Trond Kjernåsen2010-08-251-32/+32
| |
* | Add a couple of GL thread tests.Trond Kjernåsen2010-08-242-9/+162
|/ | | | | | | Drawing onto QGLWidgets in a thread should work on all supported systems. Drawing onto QPixmaps in a thread seems to work on everything except my desktop X11 system. There seems to be a bug in libXrender or possibly libX11 which causes XRenderCompositeText32() to flonk out.
* Hack .pro files on windows to define QT_NO_EGLTom Cooksey2010-03-301-0/+2
| | | | | | Temporary fix until configure.exe can be re-compiled. Reviewed-By: TrustMe
* Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-03-221-0/+3
| | | | | Conflicts: tests/auto/qgl_threads/qgl_threads.pro
* Fixed inconsistent test naming.Rohan McGovern2010-03-223-0/+548
TARGET and test class name should always match.