AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
246799d8a7
qt5base-lts/src/corelib
History
Liang Qi 246799d8a7 Merge remote-tracking branch 'origin/5.8' into dev 
Conflicts:
	examples/network/network-chat/peermanager.cpp
	src/widgets/util/qsystemtrayicon.cpp
	src/widgets/util/qsystemtrayicon_qpa.cpp
	src/widgets/util/qsystemtrayicon_win.cpp
	src/widgets/util/qsystemtrayicon_x11.cpp

Change-Id: I1c026df83818c0ccaf956980370e7522960627db
2017-01-30 12:46:20 +01:00
..
animation Remove pointless QT_NO_THREAD ifdefs from qpropertyanimation.cpp 2017-01-04 17:39:55 +00:00
arch Merge remote-tracking branch 'origin/5.7' into 5.8 2016-08-29 15:30:17 +02:00
codecs Properly use QT_CONFIG macro to check for ICU 2016-11-29 19:04:37 +00:00
doc Merge remote-tracking branch 'origin/5.8' into dev 2017-01-30 12:46:20 +01:00
global Merge remote-tracking branch 'origin/5.8' into dev 2017-01-30 12:46:20 +01:00
io Merge remote-tracking branch 'origin/5.8' into dev 2017-01-30 12:46:20 +01:00
itemmodels Merge remote-tracking branch 'origin/5.8' into dev 2017-01-25 20:06:06 +01:00
json Merge remote-tracking branch 'origin/5.7' into 5.8 2016-11-25 14:41:29 +01:00
kernel Merge remote-tracking branch 'origin/5.8' into dev 2017-01-30 12:46:20 +01:00
mimetypes Merge remote-tracking branch 'origin/5.8' into dev 2017-01-25 20:06:06 +01:00
plugin Merge remote-tracking branch 'origin/5.8' into dev 2017-01-25 20:06:06 +01:00
statemachine Fix build without feature.animation 2017-01-16 14:12:50 +00:00
thread Merge remote-tracking branch 'origin/5.8' into dev 2017-01-30 12:46:20 +01:00
tools Merge remote-tracking branch 'origin/5.8' into dev 2017-01-30 12:46:20 +01:00
xml Merge remote-tracking branch 'origin/5.7' into 5.8 2016-11-16 12:35:36 +01:00
configure.json Merge remote-tracking branch 'origin/5.8' into dev 2017-01-25 20:06:06 +01:00
corelib.pro Use separate Qt5Config.cmake inside build directory 2016-11-25 10:46:34 +00:00
eval.pri
Qt5Config.cmake.in Use separate Qt5Config.cmake inside build directory 2016-11-25 10:46:34 +00:00
Qt5CoreConfigExtras.cmake.in Use qtConfig throughout in qtbase 2016-08-19 04:28:05 +00:00
Qt5CoreConfigExtrasMkspecDir.cmake.in Generate the directory for the mkspec include in a helper file. 2013-06-21 18:58:54 +02:00
Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in Generate the directory for the mkspec include in a helper file. 2013-06-21 18:58:54 +02:00
Qt5CoreMacros.cmake Make moc obey the preprocessor environment variable for include paths 2016-07-20 02:54:09 +00:00
Qt5CTestMacros.cmake Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-04 08:59:18 +02:00
Qt5ModuleLocation.cmake.in Use separate Qt5Config.cmake inside build directory 2016-11-25 10:46:34 +00:00
Qt5ModuleLocationForInstall.cmake.in Use separate Qt5Config.cmake inside build directory 2016-11-25 10:46:34 +00:00
QtCore.dynlist
qtzlib.pro make a proper header-only module for QtZlib 2015-11-17 20:22:17 +00:00