dfc177e3a9
Conflicts: qmake/library/qmakeevaluator.cpp (cherry picked from commit 1af6dc2c8fb4d91400fddc5050166f972ae57c9a in qttools) src/corelib/kernel/qcore_mac_objc.mm src/gui/painting/qcolor.h src/plugins/platforms/cocoa/qcocoawindow.mm Change-Id: I5b3ec468a5a9a73911b528d3d24ff8e19f339f31 |
||
---|---|---|
.. | ||
bitcode.prf | ||
default_post.prf | ||
default_pre.prf | ||
device_destinations.sh | ||
devices.pl | ||
exclusive_builds_post.prf | ||
qt_parts.prf | ||
qt.prf | ||
resolve_config.prf | ||
sdk.prf | ||
testcase_targets.prf | ||
testcase.prf | ||
xcodebuild.mk | ||
xcodebuild.prf |