AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
a732576a66
qt5base-lts/mkspecs/features/uikit
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
..
bitcode.prf qmake: Also add bitcode flags to linker 2016-08-20 00:32:07 +00:00
default_post.prf Merge remote-tracking branch 'origin/5.7' into 5.8 2016-11-01 06:02:55 +01:00
default_pre.prf Be more robust about ensuring that device and simulator are set 2016-10-28 12:38:02 +00:00
device_destinations.sh Move ios_devices.pl into uikit folder 2016-08-30 18:14:32 +00:00
devices.pl Move ios_devices.pl into uikit folder 2016-08-30 18:14:32 +00:00
exclusive_builds_post.prf Refactor iOS builds to facilitate tvOS port 2016-05-05 02:08:51 +00:00
qt_config.prf Add support for Apple watchOS 2016-08-19 21:05:55 +00:00
qt_parts.prf Refactor iOS builds to facilitate tvOS port 2016-05-05 02:08:51 +00:00
qt.prf Add support for Apple watchOS 2016-08-19 21:05:55 +00:00
resolve_config.prf Merge remote-tracking branch 'origin/5.7' into 5.8 2016-11-01 06:02:55 +01:00
sdk.prf Get rid of simulator_and_device CONFIG option (mostly) 2016-10-16 00:11:59 +00:00
testcase_targets.prf Refactor iOS builds to facilitate tvOS port 2016-05-05 02:08:51 +00:00
testcase.prf Refactor iOS builds to facilitate tvOS port 2016-05-05 02:08:51 +00:00
xcodebuild.mk Merge remote-tracking branch 'origin/5.7' into 5.8 2016-09-29 00:38:01 +02:00
xcodebuild.prf Don't add -spec XXX more than once to system command in xcodebuild.prf 2016-10-04 18:33:34 +00:00