summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/xlib/qxlibintegration.cpp
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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
| * 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
* | Lighthouse xcb and xlib: Add support for transparency of GLX windows.Janusz Lewandowski2011-05-191-1/+1
|/ | | | | Merge-request: 1231 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Remove hasOpenGL. This changes breaks binary compatibillityJørgen Lind2011-04-141-0/+9
| | | | | so you will need to use $QTBUILDDIR/bin/syncqt and recompile all applications
* Lighthouse: Native interface for xlibJørgen Lind2011-04-061-1/+7
|
* Avoid duplicate calls to eglGetDisplay() in XCB / Xlib platforms.Samuel Rødal2011-03-231-1/+2
| | | | | Just call eglGetDisplay() once, as we also need to call eglInitialize() before the display can be used validly.
* Fixup license headers in Lighthouse pluginsJørgen Lind2011-03-171-1/+1
|
* Compile with glxPaul Olav Tvete2011-03-021-1/+1
| | | | Reviewed-by: Jørgen
* Lighthouse: Xlib added QXlibDisplay typeJørgen Lind2011-03-011-1/+2
| | | | We still use the nativeDisplay all over the place. Maybe we should?
* Lighthouse: fix qxlib include files after file-renameJørgen Lind2011-02-141-5/+5
|
* Lighthouse Renamed testlite files to xlibJørgen Lind2011-02-141-0/+156