Lars Knoll 314fdbce8c Merge remote branch 'gerrit/master' into refactor ... Conflicts: config.tests/unix/opengldesktop/opengldesktop.cpp examples/itemviews/interview/interview.pro examples/mainwindows/mainwindow/mainwindow.pro examples/openvg/README examples/richtext/textedit/textedit.pro examples/tools/undo/undo.pro src/corelib/global/qglobal.h src/corelib/kernel/qcoreapplication.h src/corelib/kernel/qcoreevent.h src/corelib/kernel/qmetatype.h src/gui/kernel/qevent.cpp src/gui/kernel/qevent.h src/gui/painting/qpaintengine_raster.cpp src/gui/painting/qpaintengine_raster_p.h src/gui/text/qfontdatabase.cpp src/opengl/qgl.h src/openvg/qpaintengine_vg.cpp src/plugins/platforms/wayland/qwaylandwindow.cpp tests/auto/qmainwindow/qmainwindow.pro Change-Id: I6bfb586740a68379bb99f4612ec993393a5f3234		2011-07-06 14:08:02 +02:00
..
certificateinfo.cpp	SSL example: update secure socket client example to use new cert API	2011-06-27 20:44:36 +02:00
certificateinfo.h	include fixes	2011-05-07 22:57:49 +02:00
certificateinfo.ui	Squashed commit of the changes from the mobile-examples repository	2011-05-23 14:24:07 +02:00
encrypted.png	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
main.cpp	Squashed commit of the changes from the mobile-examples repository	2011-05-23 14:24:07 +02:00
securesocketclient.desktop	Squashed commit of changes from the 4.8-temp branch.	2011-05-23 14:24:07 +02:00
securesocketclient.pro	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
securesocketclient.qrc	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
sslclient.cpp	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
sslclient.h	include fixes	2011-05-07 22:57:49 +02:00
sslclient.ui	Squashed commit of the changes from the mobile-examples repository	2011-05-23 14:24:07 +02:00
sslerrors.ui	Squashed commit of the changes from the mobile-examples repository	2011-05-23 14:24:07 +02:00