AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
b4efdd3769
qt5base-lts/tests/auto/corelib/time/qdatetime
History
Liang Qi 99cdd5fc67 Merge remote-tracking branch 'origin/5.13' into 5.14 
Conflicts:
	src/corelib/global/qrandom.cpp
	src/corelib/io/qfileinfo.cpp
	src/corelib/kernel/qeventdispatcher_win.cpp
	src/corelib/kernel/qeventdispatcher_win_p.h
	src/gui/text/qfontdatabase.cpp
	src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
	src/plugins/platforms/windows/qwindowsglcontext.cpp
	src/testlib/qtestcase.cpp

Done-With: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Done-With: Edward Welbourne <edward.welbourne@qt.io>
Change-Id: I4893212471aa24be804c989a581810e2f714545c
2019-09-30 14:43:02 +02:00
..
.gitignore Separate out the time, zone, date code from corelib/tools/ 2019-06-06 15:54:32 +02:00
qdatetime.pro Separate out the time, zone, date code from corelib/tools/ 2019-06-06 15:54:32 +02:00
tst_qdatetime_mac.mm Separate out the time, zone, date code from corelib/tools/ 2019-06-06 15:54:32 +02:00
tst_qdatetime.cpp Merge remote-tracking branch 'origin/5.13' into 5.14 2019-09-30 14:43:02 +02:00