projects / profile / ivi / qtwayland.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f286f1e bafeda5)
Merge branch 'master' into refactor
authorGunnar Sletta <gunnar.sletta@nokia.com>
Thu, 25 Aug 2011 08:11:49 +0000 (10:11 +0200)
committerGunnar Sletta <gunnar.sletta@nokia.com>
Thu, 25 Aug 2011 10:48:52 +0000 (12:48 +0200)
commit0b4f248b101ec257d3ee58d9b4e5083770534004
tree13566e2a6bdae90a7c9149b41fa838af16cf1a2ctree | snapshot
parentf286f1e9e74163968c0c4467128a5446744513cfcommit | diff
parentbafeda59c7707f67e5bbf13f3a4772e21faeb09acommit | diff
Merge branch 'master' into refactor

Conflicts:
src/gui/kernel/qapplication_qpa.cpp
src/gui/kernel/qcursor_qpa.cpp
src/gui/kernel/qwindowsysteminterface_qpa.cpp
src/gui/kernel/qwindowsysteminterface_qpa.h
src/gui/kernel/qwindowsysteminterface_qpa_p.h
src/gui/text/qtextcontrol.cpp
src/plugins/platforms/wayland/wayland.pro
src/widgets/accessible/qaccessible2.h
src/widgets/widgets/qwidgetlinecontrol_p.h

Change-Id: I5e6f4eb184159dccc67e8f13673edb884d179c74
src/plugins/platforms/wayland/qwaylandclipboard.cpp diff1 | diff2 | blob | history
src/plugins/platforms/wayland/wayland.pro diff1 | diff2 | blob | history
Domain: Graphics System / Display Server;