diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2010-04-21 11:25:54 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2010-04-21 11:25:54 (GMT) |
| commit | 6f5ad5dcab8e6f702894c4fa5c016d9837375626 (patch) | |
| tree | 8951be47d1da0f836c461d0f844083f65880ebbb /src/opengl/opengl.pro | |
| parent | 662eab575f3678364fbd3f317624fdd840e03c3c (diff) | |
| parent | 66e4d48129d6baa405ed9a4a22b12913227a8c45 (diff) | |
| download | Qt-6f5ad5dcab8e6f702894c4fa5c016d9837375626.zip Qt-6f5ad5dcab8e6f702894c4fa5c016d9837375626.tar.gz Qt-6f5ad5dcab8e6f702894c4fa5c016d9837375626.tar.bz2 | |
Merge branch 'platform_window' into lighthouse
Conflicts:
src/gui/kernel/qplatformscreen_lite.h
src/plugins/platforms/fb_base/fb_base.cpp
src/plugins/platforms/fb_base/fb_base.h
src/plugins/platforms/linuxfb/main.cpp
src/plugins/platforms/linuxfb/qgraphicssystem_linuxfb.cpp
src/plugins/platforms/linuxfb/qgraphicssystem_linuxfb.h
src/plugins/platforms/testlite/qplatformintegration_testlite.cpp
src/plugins/platforms/vnc/main.cpp
src/plugins/platforms/vnc/qgraphicssystem_vnc.cpp
src/plugins/platforms/vnc/qgraphicssystem_vnc.h
src/plugins/platforms/vnc/qvnccursor.cpp
src/plugins/platforms/vnc/qvnccursor.h
src/plugins/platforms/vnc/qvncserver.cpp
src/plugins/platforms/vnc/qvncserver.h
Diffstat (limited to 'src/opengl/opengl.pro')
0 files changed, 0 insertions, 0 deletions