a732576a66
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 |
||
|---|---|---|
| .. | ||
| noqteventloop | ||
| qbackingstore | ||
| qclipboard | ||
| qdrag | ||
| qevent | ||
| qfileopenevent | ||
| qguiapplication | ||
| qguieventdispatcher | ||
| qguieventloop | ||
| qguimetatype | ||
| qguitimer | ||
| qguivariant | ||
| qinputmethod | ||
| qkeyevent | ||
| qkeysequence | ||
| qmouseevent | ||
| qmouseevent_modal | ||
| qopenglwindow | ||
| qpalette | ||
| qpixelformat | ||
| qrasterwindow | ||
| qscreen | ||
| qsurfaceformat | ||
| qtouchevent | ||
| qwindow | ||
| kernel.pro | ||