| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
| |
Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
| |
Change copyrights and license headers from Nokia to Digia
Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Replace Nokia contact email address with Qt Project website.
- Remove "All rights reserved" line from license headers.
As in the past, to avoid rewriting various autotests that contain
line-number information, an extra blank line has been inserted at the
end of the license text to ensure that this commit does not change the
total number of lines in the license header.
Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Simple search and replace. This commit doesn't touch 3rd-party files,
nor translations (where the change is not so simple and will be handled
in a separate commit).
Change-Id: I4e48513b8078a44a8cd272326685b25338890148
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
|
| |
Reducing the amount of spelling errors from NBN.
Change-Id: I9b228bb95b4a757cff57595125009e70b0097d86
Reviewed-by: Rohan McGovern
|
| |
|
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
doc/src/declarative/righttoleft.qdoc
examples/draganddrop/fridgemagnets/main.cpp
examples/script/context2d/main.cpp
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/plugins/platforms/wayland/qwaylandclipboard.cpp
src/plugins/platforms/wayland/qwaylandclipboard.h
src/plugins/platforms/wayland/qwaylanddisplay.cpp
src/s60installs/eabi/QtOpenGLu.def
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Make sure to pick an alpha visual also for non-GL surface types, and to
ask for alpha in the window format if the WA_TranslucentBackground
attribute is set.
Reviewed-by: Janusz Lewandowski
|
|\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/gui/text/qrawfont.cpp
src/gui/text/qtextlayout.cpp
src/gui/util/qscroller.cpp
src/gui/widgets/qlineedit.cpp
|
| |/
| |
| |
| |
| |
| |
| | |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
| | |
|
|/ |
|
|
|
|
|
| |
so you will need to use $QTBUILDDIR/bin/syncqt and recompile all
applications
|
|\
| |
| |
| |
| | |
Conflicts:
mkspecs/qws/macx-nacl-g++/qplatformdefs.h
|
| |
| |
| |
| |
| | |
Reviewed-by: Trust Me
(cherry picked from commit 774a3536b00c4d6e4c4c10b708e31b4373a338e3)
|
| | |
|
|/
|
|
| |
before doing the QGLWidget event handling
|
|
|
|
|
|
|
| |
information. Prior to this, if a context was created with QGLWidget it
would setup the sharing correct, but all sharing actually created on a
QPlatformGLContext level was ignored by the QGLContext, thus indicating
that it wasnt sharing with any other context.
|
|
|
|
|
|
|
|
|
| |
truth to be told, I can't remember why I decided that it was a good idea
to have the code there. But clearly now I don't think so anymore. Such
initialisation should happen in qgl_qpa.cpp chooseContext.
If we tear down the window and the context then that has to be solved
elsewhere.
|
| |
|
|
|
|
| |
and ifdef the functions in qgl.h
|
|
|
|
|
|
|
|
|
|
|
|
| |
resources. The example plugins EGLFS uses only 1 native
context. Make sure that we only use this 1 context, and that we dont
wrap it in many different QPlatformGLContexts or QGLContexts instanses.
This change also removes the QPlatformWindow link which was made in the
initial QPlatformGLContext change. Lighthouse has to support situations
where a context isnt bound to a QPlatformWindow.
Reviewed-by: gunnar
|
|
|
|
|
|
|
|
|
| |
This means the threading functionality has been delegated down to
QPlatformGLContext. However, it is still possible to use
QGLContext::currentContext to retrieve the QGLContext. This so that
QGLFunctions, QGLShaderProgram etc can be used without a QGLWidget.
Reviewed-by: paul
|
|
|
|
| |
Reviewed-by: paul
|
| |
|
|
|
|
|
|
|
|
|
| |
This reverts commit a8530e5db7ae25ea0ab5df4681308374abf8b6ba.
Conflicts:
src/gui/kernel/qplatformglcontext_qpa.cpp
src/gui/kernel/qplatformglcontext_qpa.h
|
|
|
|
|
|
| |
should help if there are not many glxconfigs available. Also made
QGLTemporaryContext use a QWidget again instead of a QGLWidget; This
allows us to ask for a smaller window size before making the context.
|
|
|
|
| |
Reviewed-by: Jørgen Lind
|
|
|
|
|
| |
and made glxintegrations shared context use the correct window
configuration
|
|
|
|
| |
Reviewed-by: Jørgen Lind
|
|
|
|
| |
Also create a correct window for the format.
|
| |
|
|
|
|
|
| |
if the platformWindow is visible. Also had to make sure that the
QGLContext of a QGLWidget was recreated.
|
|
|
|
|
|
|
|
| |
QPlatformGlContext has now a pure virtual format getter.
The way its intended to work is that the tlw has a QPlatformWindowFormat
which is the requested format. Once you get the QPlatformGlContext of
the window, you can request the QPlatformWindowFormat of the context to
see what you really got.
|
| |
|
| |
|
|
|
|
|
|
|
|
| |
This adds a getter to QPlatformGLContext for the "default shared
context". The setter is protected as it is the plugins responsibillity
to create it or not. QPlatformWindowFormat has also gotten a pointer to
a QPlatformGLContext for a non default shared context. Only implemented
shared contexts in testlite for now.
|
|
|
|
|
| |
it is owned by the QPlatformWindow, and should thus be delted by it,
even for QGLContext
|
| |
|
|
|