qt6-bb10/tests/auto/corelib/io/qtemporaryfile
Liang Qi 88cf044580 Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
	src/gui/kernel/qwindow.cpp
	src/plugins/platforms/cocoa/qcocoawindow.mm
	src/plugins/platforms/windows/qwindowssystemtrayicon.cpp
	src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
	tests/auto/corelib/io/qtemporarydir/tst_qtemporarydir.cpp
	tests/auto/widgets/kernel/qaction/tst_qaction.cpp

Change-Id: Ifa515dc0ece7eb1471b00c1214149629a7e6a233
2017-11-09 11:47:57 +01:00
..
resources Rename createLocalFile to createNativeFile & deprecate createLocalFile 2012-10-02 10:43:48 +02:00
.gitignore Moving relevant tests to corelib/io 2011-08-31 10:08:38 +02:00
android_testdata.qrc Android: Fix QTemporaryFile tests 2015-01-08 10:06:50 +01:00
qtemporaryfile.pro testlib: start sharing common helper functions 2017-11-04 20:11:22 +00:00
qtemporaryfile.qrc Rename createLocalFile to createNativeFile & deprecate createLocalFile 2012-10-02 10:43:48 +02:00
tst_qtemporaryfile.cpp Merge remote-tracking branch 'origin/5.9' into 5.10 2017-11-09 11:47:57 +01:00