Frederik Gladhorn a1fe728fa5 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/gui/kernel/qguiapplication.cpp src/plugins/platforms/android/androidjnimain.cpp src/plugins/platforms/android/qandroidplatformintegration.cpp src/plugins/platforms/android/qandroidplatformintegration.h src/plugins/platforms/android/qandroidplatformopenglcontext.cpp src/plugins/platforms/cocoa/qcocoawindow.h src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/sql/doc/src/sql-driver.qdoc src/widgets/widgets/qtoolbararealayout.cpp Change-Id: Ifd7e58760c3cb6bd8a7d1dd32ef83b7ec190d41e		2014-02-07 13:07:25 +01:00
..
images	Update some more screenshots in qtbase/examples/widgets.	2014-01-31 16:18:07 +01:00
src	Merge remote-tracking branch 'origin/stable' into dev	2014-02-07 13:07:25 +01:00
dropsite.qdoc	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
mousebuttons.qdoc	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00