summaryrefslogtreecommitdiffstats
path: root/src/opengl/qgl_qpa.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Updated year in copyright headerKai Koehne2014-03-261-1/+1
| | | | | | | | | | | | | | | | | | find . -path '*/3rdparty/*' -prune -o -type f -print | xargs -L1 sed -i -E 's/Copyright(.*) 2013 Digia/Copyright\1 2014 Digia/g' Manually patched files: demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h demos/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp src/3rdparty/s60/eiksoftkeyimage.h tools/qdoc3/test/qt-project.qdocconf tests/auto/qsharedpointer/nontracked.h tests/auto/qsharedpointer/nontracked.cpp Change-Id: I3f9074923b4d6bd4666258ab04f01476cc6e901c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-131-1/+1
| | | | | | Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-291-24/+24
| | | | | | | | 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>
* Update contact information in license headers.Sergio Ahumada2012-08-011-2/+2
| | | | | | | | | | | | | - 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>
* Update year in Nokia copyright messages.Jason McDonald2012-01-111-1/+1
| | | | | | | | | 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>
* Doc: Fixing typoSergio Ahumada2011-08-171-1/+1
| | | | | | | Reducing the amount of spelling errors from NBN. Change-Id: I9b228bb95b4a757cff57595125009e70b0097d86 Reviewed-by: Rohan McGovern
* Doc: Updated documentation with \since 4.8 declarations.David Boddie2011-06-301-0/+6
|
* Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-06-171-0/+2
|\ | | | | | | | | | | | | Conflicts: doc/src/declarative/righttoleft.qdoc examples/draganddrop/fridgemagnets/main.cpp examples/script/context2d/main.cpp
| * Merge remote branch 'qt/4.8' into fire-masterPaul Olav Tvete2011-06-061-17/+17
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/platforms/wayland/qwaylandclipboard.cpp src/plugins/platforms/wayland/qwaylandclipboard.h src/plugins/platforms/wayland/qwaylanddisplay.cpp src/s60installs/eabi/QtOpenGLu.def
| * | Full translucent background support in xcb and xlib backend.Samuel Rødal2011-05-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-05-241-17/+17
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | Conflicts: src/gui/text/qrawfont.cpp src/gui/text/qtextlayout.cpp src/gui/util/qscroller.cpp src/gui/widgets/qlineedit.cpp
| * | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-131-17/+17
| |/ | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | Doc: Fixed qdoc warnings.David Boddie2011-05-121-0/+6
| |
* | Doc: Fixed qdoc warnings.David Boddie2011-05-111-0/+4
|/
* Remove hasOpenGL. This changes breaks binary compatibillityJørgen Lind2011-04-141-1/+2
| | | | | so you will need to use $QTBUILDDIR/bin/syncqt and recompile all applications
* Merge remote-tracking branch 'origin/master' into lighthouse-masterJørgen Lind2011-03-171-1/+1
|\ | | | | | | | | Conflicts: mkspecs/qws/macx-nacl-g++/qplatformdefs.h
| * Update copyright year to 2011.Rohan McGovern2011-03-111-1/+1
| | | | | | | | | | Reviewed-by: Trust Me (cherry picked from commit 774a3536b00c4d6e4c4c10b708e31b4373a338e3)
* | Remove warning msg in Lighthouse QGLWidget codeJørgen Lind2011-02-091-1/+0
| |
* | Lighthouse: QGLWidgetPropogate the resizeEvent down to the WidgetJørgen Lind2011-02-071-1/+2
|/ | | | before doing the QGLWidget event handling
* Make QGLContext::fromPlatformGLContext show correct sharingJørgen Lind2011-01-251-16/+14
| | | | | | | 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.
* Remove Lighthouse specific code in QGLWidget constructorJørgen Lind2011-01-041-5/+0
| | | | | | | | | 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.
* Make QtOpenGL use shared contextexts on LighthouseJørgen Lind2010-11-261-8/+25
|
* Move the Lighthouse specfic api into qpa_qpa.cppJørgen Lind2010-11-261-0/+20
| | | | and ifdef the functions in qgl.h
* Lighthouse: Fix QGLContext::currentContext for systems with limitedJørgen Lind2010-11-241-10/+10
| | | | | | | | | | | | 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
* Lighthouse: move the currentContext functionality to QPlatformGLContextJørgen Lind2010-11-221-7/+15
| | | | | | | | | 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
* No more windowsurface for QGLWidget in LighthouseJørgen Lind2010-11-221-0/+1
| | | | Reviewed-by: paul
* Add workaround_brokenFBOReadback=true for maliGunnar Sletta2010-11-191-0/+9
|
* Revert "Allow customizing the default fbo from the QPlatformGLContext."Jørgen Lind2010-08-111-1/+0
| | | | | | | | | This reverts commit a8530e5db7ae25ea0ab5df4681308374abf8b6ba. Conflicts: src/gui/kernel/qplatformglcontext_qpa.cpp src/gui/kernel/qplatformglcontext_qpa.h
* Added reduced config to glxconfigJørgen Lind2010-08-061-4/+10
| | | | | | 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.
* Add missing null check to lighthouse's QGLTemporaryContext.Christian Kamm2010-08-061-2/+4
| | | | Reviewed-by: Jørgen Lind
* Fixed Lighthouse tempcontext to reset to current contextJørgen Lind2010-08-061-5/+8
| | | | | and made glxintegrations shared context use the correct window configuration
* Allow customizing the default fbo from the QPlatformGLContext.Christian Kamm2010-08-061-0/+1
| | | | Reviewed-by: Jørgen Lind
* Make the GLX integration give more correct formatJørgen Lind2010-08-061-1/+2
| | | | Also create a correct window for the format.
* Forgot to makeCurrent before QGLWidget::resizeGL in LighthouseJørgen Lind2010-08-041-0/+1
|
* Make QWidget::setPlatformWindowFormat recreate platformWindowJørgen Lind2010-08-041-10/+19
| | | | | if the platformWindow is visible. Also had to make sure that the QGLContext of a QGLWidget was recreated.
* Make it possible to view what format a QPlatformGlContext hasJørgen Lind2010-08-031-0/+1
| | | | | | | | 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.
* Added QGLFormat to QPlatformWindowFormat conversionJørgen Lind2010-07-271-4/+66
|
* fix QGLContext::reset in lighthouseJørgen Lind2010-07-261-2/+4
|
* Make it possible to have shared contexts to LighthouseJørgen Lind2010-07-231-0/+3
| | | | | | | | 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.
* Fix deletion of QPlatformGLContextJørgen Lind2010-07-081-1/+1
| | | | | it is owned by the QPlatformWindow, and should thus be delted by it, even for QGLContext
* Make tempcontext use new lighthouse apiJørgen Lind2010-07-081-3/+5
|
* Renamed files from *_lite* to *_qpa*Jørgen Lind2010-06-241-0/+253
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 02:35:16 +0000