whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/tests/auto/corelib/kernel/qtranslator
History
Liang Qi 305dd1b61f Merge remote-tracking branch 'origin/5.9' into 5.11 
Conflicts:
	.qmake.conf
	src/corelib/animation/qvariantanimation.cpp
	src/corelib/global/qglobal.cpp
	src/corelib/global/qlogging.cpp
	src/corelib/io/qprocess_win.cpp
	src/corelib/json/qjsonarray.cpp
	src/corelib/tools/qsimd_p.h
	src/corelib/tools/qtimezoneprivate_p.h
	src/corelib/xml/qxmlstream_p.h
	src/gui/kernel/qsimpledrag.cpp
	src/gui/kernel/qsimpledrag_p.h
	src/plugins/generic/generic.pro
	src/plugins/platforms/cocoa/qcocoamenu.mm
	src/widgets/styles/qmacstyle_mac.mm
	tests/auto/concurrent/qtconcurrentmap/BLACKLIST
	tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
	tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
	tests/auto/gui/kernel/qwindow/BLACKLIST
	tests/auto/widgets/dialogs/qmessagebox/BLACKLIST

Change-Id: I508d686cf20f7f8cc6a7119b9bc7c3bbb505c58e
 		2018-02-14 12:51:24 +01:00
..
.gitignore Moving relevant tests to corelib/kernel 2011-09-01 12:42:14 +02:00
android_testdata.qrc Android: Fix QTranslator tests 2015-01-06 16:44:27 +01:00
dependencies_la.qm Enable modularization of translation files. 2012-07-12 18:30:35 +02:00
dependencies_la.ts Enable modularization of translation files. 2012-07-12 18:30:35 +02:00
hellotr_la.qm Moving relevant tests to corelib/kernel 2011-09-01 12:42:14 +02:00
hellotr_la.ts Moving relevant tests to corelib/kernel 2011-09-01 12:42:14 +02:00
msgfmt_from_po.qm Moving relevant tests to corelib/kernel 2011-09-01 12:42:14 +02:00
qtranslator.pro Support for Q_OS_ANDROID_EMBEDDED and android-embedded build flags 2018-01-20 18:16:59 +00:00
qtranslator.qrc Moving relevant tests to corelib/kernel 2011-09-01 12:42:14 +02:00
tst_qtranslator.cpp Merge remote-tracking branch 'origin/5.9' into 5.11 2018-02-14 12:51:24 +01:00