| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Use the thread-default glib context for the DBus connection in the ICD bearer manager.
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
bearer manager.
This allows the bearer management plugin to be ran on a thread
different than the main one.
Task-number: QTBUG-17199
Reviewed-by: Kranthi <kranthi.kumar-kuntala@nokia.com>
|
| |\ \
| |/
|/|
| |
| |
| |
| | |
Conflicts:
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix QMutex can deadlock when calling tryLock
Fixed missing text when using static text items in GL 2 engine.
Prevent recursion when creating window surface.
Fixed es2 configure when both EGL/egl.h and GLES/egl.h are present.
document that QThread::exit will exit future event loops
Revert "Restore Qt 4.6 behaviour: exec() always enters the event loop."
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
If we can't access the qt_gl_share_widget() we should just create a
raster window surface. This might happen when creating the share widget
itself leads to creation of a window surface (which isn't really going
to be used anyways).
Reviewed-by: Michael Dominic K
|
| | |/
| |
| |
| |
| | |
Reviewed-by: Aaron McCarthy
Task-number: QTBUG-17035
|
| |\ \ |
|
| | |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The Phonon API does not provide any way for the client to specify
which network connection should be used for streaming playback.
If the application already has a connection open, using a bearer
other than the default (e.g. using WiFi when the device default is
GPRS), it may be desirable to use it for streaming, rather than
allowing the Phonon backend to open a second connection on the
default bearer.
This patch adds a custom property on the Phonon::MediaObject,
called InternetAccessPointName. The client can specify the IAP
which Phonon should use by setting this property.
Note that support for this property is only provided in the Phonon
MMF backend.
Task-number: QTBUG-11436
Reviewed-by: Gareth Stockwell
|
| | | |\ |
|
| | | | |\
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QFont/Windows: restrict the pixel size accuracy
Update copyright year to 2011.
For non-developer builds, skip test that requires private API
tst_qhttpnetworkconnection: Compile fix
Change QHostInfoCache to use QElapsedTime instead of QTime.
Fix for qtdemo bug
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Currently Symbian doesn't support semi-transparent EGL surfaces.
WA_TranslucentBackground attribute is ineffective if set after EGL
surface creation. To enable translucency in this case we need to
recreate backing store to get raster surface which supports translucency.
Task-number: QT-4416
Reviewed-by: Jason Barron
|
| | | |\ \ \
| | | |_|/
| | |/| |
| | | | | |
integration
|
| | | | | | |
|
| | | | |/
| | |/|
| | | |
| | | | |
Reviewed-by: Trust Me
|
| | | |\ \ |
|
| | | | |\ \ |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Currently QS60Style loads automatically a plugin to support tactile
feedback for styled applications. However, there is no control over
this, so applications cannot remove the automatic support, if they'd
like to use Mobility APIs to control the feedback themselves.
In order to avoid this, remove tactile feedback plugin from style.
Lets see if we can later put this back with optional enable/disable
flag.
Task-number: QTBUG-16151
Reviewed-by: Miikka Heikkinen
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Merge-request: 906
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
|
| | |\ \ \ \ \
| | |/ / / / |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The access point scanner cancels itself in the destructor.
This requires the handle to be valid, but it was closed in the symbian
engine destructor immediately before deleting the AP scanner.
Because of the way symbian active objects work, the crashing function
is only called if there was an asynchronous request in progress.
So it could be missed in cases where the scan completes faster than the
test case.
Task-number: QTBUG-16484
Reviewed-by: Markus Goetz
|
| | |\ \ \ \ \
| | |/ / / / |
|
| | | | |/ /
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Not pixmap creation.
Merge-request: 988
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| | | | | | |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Today there is a connection between QWidget and QPlatformScreen. So I
added a accessor in QWaylandScreen to get the corresponding
QWaylandDisplay. So now it should be possible to have different
QWaylandDisplays. But also its possible to use the internal Lighthouse
api closer in the wayland plugin if that should be of interest ;)
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Actually the fbo belongs to the QWaylandPaintDevice, which also holds n
QWaylandDrmBuffers. Then the QWaylandDrmWindowSurface gets the current
drmbuffer used on flush and attaches it to the window and calls
wl_surface_damage
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Ie. Moving code into different files and refactoring some of the
classes. The Drmbuffer was most affected.
It has a depth and stencil buffer.
QWaylandGLContext contain the context. The drm buffer class has to
be bound to the context before used.
|
| | | | | | |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
such as
wl_display_create -> wl_display_connect
wl_surface_attach (attributes)
wl_surface_map -> wl_surface_map_toplevel
wl_shell_listener
wl_output_listener
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Truth be told, the x11 clipboard integration in testlite was done rather
quickly, thus leaving some cornercases open
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Without this patch Qt applications will crash the moment the mouse pointer
enters the window.
Signed-off-by: Rolf Offermanns <roffermanns@sysgo.com>
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
On this system the IncludePath for drm.h was missing
So maybe pkgconfig should be additionally also used for
libxkbcommon, EGL and GLESv2 to prevent such problems.
but i dont know whether its common to use pkg-config in qmake
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
When creating DRM buffers we should try to match the visual type
requested with the buffer format.
|
| | | | | | |
|
| | | | | |
| | | | |
| | | | |
| | | | | |
For clarity and to prevent merge conflicts etc. in future.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
We're drawing into the parent, so we need to use the parent's geometry
for the GL viewport, or we may not be able to draw it. We also need to
use the parent width & height when checking whether to normalize to 1.0
or -1.0 in the coord transform calculations.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
If the geometry isn't mapped 1:1 we need to divide the bottom by height,
not width, to calculate the texture rectangle.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Pull the swap fbo and rbo into the context and make sure to destroy them
when the context goes away. Add unfortunate lazy allocation of the fbo
and rbo because we need them to be part of the right context.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Make sure we copy from the private surface into the parent surface at
swapBuffers time.
|
| | | | | |
| | | | |
| | | | |
| | | | | |
We'll need this to handle GL widgets.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This will let us source from offscreen GL widget surfaces and copy into
the parent surface.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Even GL widgets will allocate window surfaces, so share everything
there. This still leaves a hole when we mix GL widgets and the raster
back end (the created platform GL context won't have a DRM buffer to use
for its objects & context), but that won't work right now anyway...
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
GL widgets need a platform GL context. Add one to get hellogl_es2
limping along.
|
| | | | | |
| | | | |
| | | | |
| | | | | |
This will set mUseOpenGL when -platform waylandgl is passed to clients.
|
| | | | | | |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Works with analogclock, draws upside down, fails to resize, and doesn't
show GL widget with hello_es2.
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Unused variables, debug output.
|
| | | | | | |
|
| | | | | | |
|
| | | | | | |
|
