Frederik Gladhorn 39a290af6c Merge remote-tracking branch 'origin/5.3' into dev ... Conflicts: src/gui/accessible/qaccessiblecache_mac.mm src/gui/accessible/qaccessiblecache_p.h src/plugins/platforms/cocoa/qcocoaaccessibilityelement.h src/plugins/platforms/cocoa/qcocoawindow.h src/plugins/platforms/cocoa/qcocoawindow.mm src/widgets/kernel/qwidget_qpa.cpp Manually moved change in qwidget_qpa.cpp to qwidget.cpp (cd07830e3b) Change-Id: Ia51f471f9b53de2f3b07d77ea89db9303ac8961d		2014-07-03 23:56:45 +02:00
..
.gitignore	Moving relevant tests to corelib/io	2011-08-31 10:08:38 +02:00
qdebug.pro	Fix data race on QLoggingCategory when using qDebug from multiple threads	2014-06-20 21:54:04 +02:00
tst_qdebug.cpp	Merge remote-tracking branch 'origin/5.3' into dev	2014-07-03 23:56:45 +02:00