AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17198e03ab
qt5base-lts/qmake/generators/win32
History
Liang Qi 17198e03ab Merge remote-tracking branch 'origin/5.7' into dev 
Conflicts:
	qmake/doc/src/qmake-manual.qdoc
	src/corelib/global/qglobal.cpp
	src/corelib/tools/qstring.cpp
	src/network/socket/qabstractsocket.cpp
	src/network/socket/qnativesocketengine_unix.cpp
	src/plugins/platforms/eglfs/api/qeglfsglobal.h

Change-Id: Id5dfdbd30fa996f9b4b66a0b030b7d3b8c0ef288
2016-08-16 07:58:32 +02:00
..
mingw_make.cpp Merge remote-tracking branch 'origin/5.6' into dev 2016-02-11 08:25:04 +01:00
mingw_make.h Merge remote-tracking branch 'origin/5.6' into dev 2016-01-26 16:27:28 +01:00
msbuild_objectmodel.cpp Merge remote-tracking branch 'origin/5.6' into dev 2016-02-11 08:25:04 +01:00
msbuild_objectmodel.h Updated license headers 2016-01-21 18:55:18 +00:00
msvc_nmake.cpp Merge remote-tracking branch 'origin/5.7' into dev 2016-08-16 07:58:32 +02:00
msvc_nmake.h Updated license headers 2016-01-21 18:55:18 +00:00
msvc_objectmodel.cpp Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-20 08:00:26 +02:00
msvc_objectmodel.h qmake: remove some empty user-defined dtors 2016-02-15 14:45:40 +00:00
msvc_vcproj.cpp Remove the -target command line option 2016-07-05 15:49:03 +00:00
msvc_vcproj.h Updated license headers 2016-01-21 18:55:18 +00:00
msvc_vcxproj.cpp Updated license headers 2016-01-21 18:55:18 +00:00
msvc_vcxproj.h Updated license headers 2016-01-21 18:55:18 +00:00
winmakefile.cpp Remove Windows CE vestige 2016-06-20 12:51:43 +00:00
winmakefile.h Updated license headers 2016-01-21 18:55:18 +00:00