J-P Nurmi 0fcce50af0 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: mkspecs/features/qt.prf src/plugins/platforms/xcb/qxcbwindow.h src/tools/qdoc/qdocindexfiles.cpp src/widgets/kernel/qwidget_qpa.cpp Change-Id: I214f57b03bc2ff86cf3b7dfe2966168af93a5a67		2014-06-05 22:26:44 +02:00
..
.gitignore	Moving relevant tests to corelib/io	2011-08-31 10:08:38 +02:00
qfilesystemwatcher.pro	Disable tst_QFileSystemWatcher	2013-09-20 12:03:22 +02:00
tst_qfilesystemwatcher.cpp	Merge remote-tracking branch 'origin/stable' into dev	2014-06-05 22:26:44 +02:00