AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
67c6d0f54e
qt5base-lts/config.tests
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
..
arch PowerPC: Add detection of SPE (found on e500) and VSX 2016-06-19 18:46:26 +00:00
common Fix issue causing pch configure test to always fail 2016-08-24 20:36:05 +00:00
mac/corewlan rewrite library handling in configure 2016-08-18 17:09:52 +00:00
qpa rewrite library handling in configure 2016-08-18 17:09:52 +00:00
unix Migrate libinput support away from QT_LIBRARY_VERSION 2016-10-10 16:59:26 +00:00
win Merge remote-tracking branch 'origin/5.7' into 5.8 2016-11-01 06:02:55 +01:00
x11 rewrite library handling in configure 2016-08-18 17:09:52 +00:00
.gitignore Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
.qmake.conf make also configure tests not see %LIB% and %INCLUDE% under mingw 2016-10-17 13:44:43 +00:00