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 6b2535ea15 Merge remote-tracking branch 'origin/5.15' into dev 
Conflicts:
	examples/widgets/graphicsview/boxes/scene.h
	src/corelib/Qt5CoreMacros.cmake
	src/corelib/Qt6CoreMacros.cmake
	src/network/ssl/qsslsocket.cpp
	src/network/ssl/qsslsocket.h
	src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp
	src/testlib/CMakeLists.txt
	src/testlib/.prev_CMakeLists.txt
	tests/auto/corelib/tools/qscopeguard/tst_qscopeguard.cpp

Disabled building manual tests with CMake for now, because qmake
doesn't do it, and it confuses people.

Done-With: Alexandru Croitor <alexandru.croitor@qt.io>
Done-With: Volker Hilsheimer <volker.hilsheimer@qt.io>
Change-Id: I865ae347bd01f4e59f16d007b66d175a52f1f152
 		2020-02-13 18:31:40 +01:00
..
.gitignore
…
CMakeLists.txt Regenerate tests/auto/corelib/kernel 2019-11-12 17:25:04 +00:00
android_testdata.qrc Allow loading of empty translation files 2018-07-12 08:54:33 +00:00
dependencies_la.qm
…
dependencies_la.ts
…
hellotr_empty.qm Allow loading of empty translation files 2018-07-12 08:54:33 +00:00
hellotr_empty.ts Allow loading of empty translation files 2018-07-12 08:54:33 +00:00
hellotr_la.qm QTranslator: Expose language of translation file 2020-02-10 15:14:55 +00:00
hellotr_la.ts
…
msgfmt_from_po.qm
…
qtranslator.pro Allow loading of empty translation files 2018-07-12 08:54:33 +00:00
qtranslator.qrc Allow loading of empty translation files 2018-07-12 08:54:33 +00:00
tst_qtranslator.cpp QTranslator: Expose language of translation file 2020-02-10 15:14:55 +00:00