AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6a4aaa3477
qt5base-lts/qmake/generators/win32
History
Liang Qi a732576a66 Merge remote-tracking branch 'origin/5.7' into 5.8 
Conflicts:
	config.tests/win/msvc_version.cpp
	configure.pri
	mkspecs/macx-ios-clang/features/default_post.prf
	mkspecs/macx-ios-clang/features/resolve_config.prf
	mkspecs/features/uikit/default_post.prf
	mkspecs/features/uikit/resolve_config.prf
	src/corelib/io/qsettings_mac.cpp
	src/corelib/json/qjsondocument.cpp
	src/plugins/platforms/cocoa/qcocoawindow.h
	src/plugins/platforms/cocoa/qcocoawindow.mm
	src/plugins/platforms/cocoa/qnswindowdelegate.h
	src/plugins/platforms/cocoa/qnswindowdelegate.mm
	src/plugins/platforms/ios/ios.pro
	src/plugins/platforms/ios/kernel.pro
	src/plugins/platforms/ios/qiosintegration.h
	src/plugins/platforms/minimalegl/qminimaleglintegration.cpp
	tests/auto/gui/painting/qpainter/tst_qpainter.cpp
	tools/configure/environment.cpp

Change-Id: I654845e54e40f5951fb78aab349ca667e9f27843
2016-11-01 06:02:55 +01: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 5.8 2016-11-01 06:02:55 +01: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: don't hold VCFilter in QList 2016-08-16 17:09:07 +00:00
msvc_vcproj.cpp win32: Fix Visual Studio project generation 2016-09-22 09:36:18 +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