Conflicts: .qmake.conf sc/corelib/io/qfsfileengine_p.h src/corelib/io/qstorageinfo_unix.cpp src/platformsupport/eglconvenience/qeglpbuffer_p.h src/platformsupport/input/libinput/qlibinputkeyboard.cpp src/platformsupport/input/libinput/qlibinputpointer.cpp src/plugins/platforms/cocoa/qcocoamenu.mm src/plugins/platforms/ios/qiosscreen.h src/plugins/platforms/ios/qioswindow.h src/plugins/platforms/ios/quiview.mm src/printsupport/dialogs/qpagesetupdialog_unix_p.h src/printsupport/dialogs/qprintpreviewdialog.cpp src/printsupport/widgets/qcupsjobwidget_p.h src/widgets/widgets/qmenu.cpp tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp Change-Id: Iecb4883122efe97ef0ed850271e6c51bab568e9c |
||
|---|---|---|
| .. | ||
| hpack | ||
| hsts | ||
| http2 | ||
| qabstractnetworkcache | ||
| qftp | ||
| qhttpnetworkconnection | ||
| qhttpnetworkreply | ||
| qnetworkaccessmanager | ||
| qnetworkcachemetadata | ||
| qnetworkcookie | ||
| qnetworkcookiejar | ||
| qnetworkdiskcache | ||
| qnetworkreply | ||
| qnetworkrequest | ||
| spdy | ||
| access.pro | ||