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
..
.gitignore	Moving relevant tests to corelib/tools	2011-09-01 13:07:23 +02:00
double_data.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qstring.pro	Add Mac type conversion functions to QtCore	2013-09-21 05:09:41 +02:00
tst_qstring_mac.mm	Add Mac type conversion functions to QtCore	2013-09-21 05:09:41 +02:00
tst_qstring.cpp	Merge remote-tracking branch 'origin/stable' into dev	2014-02-07 13:07:25 +01:00