| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| | |
Conflicts:
mkspecs/features/symbian/application_icon.prf
src/sql/drivers/odbc/qsql_odbc.cpp
|
| |
| |
| |
| | |
Reviewed-by: TRUSTME
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| | |
for some reason rvct didn't catch that.
Reviewed-by: TRUSTME
|
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| | |
|
| | |
|
|/
|
|
|
|
|
| |
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.
|
|
|
|
|
|
| |
Temporary fix until configure.exe can be re-compiled.
Reviewed-By: TrustMe
|
|
|
|
|
| |
Conflicts:
tests/auto/qgl_threads/qgl_threads.pro
|
|
TARGET and test class name should always match.
|