| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
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.
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
| |
The surface is destroyed when the window is hidden, so we can't use that
for looking up the widget to send events to.
|
| |
|
| |
|
| |
|
| |
|
|
|
|
| |
Remove code which was wrong
|
|
|
|
| |
QApplication allready knows the modifiers
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Add -platformpluginpath command line option that
spesifies an additional directory to scan for
plugins. Also read QT_QPA_PLATFORM_PLUGIN_PATH.
QlatformIntegrationFacgtory::create() now tries
to load the plugin from the external path first.
Similarly, keys() returns the keys from the
extra path in addition to the "internal" keys
API changes:
QPlatformIntegration::create() and keys() now take
an optional const QString &platformPluginPath.
New file:
externalplugin.pri, contains instructions and a
base setup for building external plugins.
|
|
|
|
|
|
|
|
| |
There is really no good way of detecting if to use EGL instead of
GLX using qmake. So this is the behavior for now:
if QtOpenGL is compiled with "desktop gl" then use GLX if its compiled
with OpenGLES2 then use EGL.
|
|
|
|
|
| |
compatible. Ie. it does not have glx. Haven't made the egl integration
yet for testlite
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
| |
which is a class to resolve atoms etc.
|
| |
|
| |
|
| |
|
| |
|
|
|
|
| |
It was broken since it didn't take care of the initial cursor.
|
| |
|
|
|
|
|
|
|
|
| |
I added an x11{ } clause in the pro file for the plugin. But as it
turnes out the x11 clause is defined in gui.pro so it is not available
for use in any other pro or pri files.
Also fixed a missing !qpa in qttest_p4.prf
|
| |
|
|
|
|
|
|
| |
The idea is that QPlatformWindows can request focus handling. And when
actual focus shifting is done by windowsystem callbacks/events which are
sent to QWindowSystemInterface
|
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
RevBy: Trust me
Conflicts:
src/plugins/phonon/mmf/mmf.pro
src/s60installs/s60installs.pro
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
demos/declarative/minehunt/minehunt.pro
src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
src/plugins/phonon/mmf/mmf.pro
src/s60installs/s60installs.pro
tests/auto/qapplication/test/test.pro
tests/auto/qgraphicsview/tst_qgraphicsview.cpp
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When parsing a new connection an access point with the same SSID may not
have been previously seen.
Task-number: QTBUG-15276
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
In early system startup applications may try to use ICD before it is
contactable. Ensure that the connection to ICD is established before all
calls are made.
If ICD is still not contactable QDBusServiceWatcher is used to monitor
registration of the com.nokia.icd2 address and reconnection is attempted
once ICD is started.
Task-number: Maemo 199755
|
| | |
| | |
| | |
| | | |
RevBy: Trust me
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
configure
src/gui/graphicsview/qgraphicslayout.cpp
src/gui/text/qfontengine_s60.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/qwindowsurface_gl.cpp
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
|