AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
82deb0ad16
qt5base-lts/tests/auto/corelib/tools/qtimezone
History
Liang Qi ce09ef4313 Merge remote-tracking branch 'origin/5.9' into dev 
Conflicts:
	src/corelib/io/qprocess_unix.cpp
	src/corelib/io/qprocess_win.cpp
	src/plugins/platforms/android/qandroidplatformintegration.h
	src/plugins/platforms/windows/qwindowscontext.cpp
	src/plugins/platforms/windows/windows.pri
	src/tools/uic/cpp/cppwriteinitialization.cpp
	src/widgets/doc/src/widgets-and-layouts/gallery.qdoc

Change-Id: I8d0834c77f350ea7540140c2c7f372814afc2d0f
2017-06-19 16:12:34 +02:00
..
qtimezone.pro Add conversion functions for QTimeZone and CFTimeZone/NSTimeZone 2017-01-23 21:55:22 +00:00
tst_qtimezone_darwin.mm Add conversion functions for QTimeZone and CFTimeZone/NSTimeZone 2017-01-23 21:55:22 +00:00
tst_qtimezone.cpp Merge remote-tracking branch 'origin/5.9' into dev 2017-06-19 16:12:34 +02:00