34aba4724f
Conflicts: src/corelib/io/qiodevice.cpp src/plugins/bearer/linux_common/qofonoservice_linux.cpp src/plugins/bearer/linux_common/qofonoservice_linux_p.h src/plugins/platforms/android/qandroidplatformtheme.cpp src/tools/bootstrap/bootstrap.pro src/widgets/styles/qmacstyle_mac.mm Change-Id: Ia02aab6c4598ce74e9c30bb4666d5e2ef000f99b |
||
---|---|---|
.. | ||
animation | ||
desktop | ||
dialogs | ||
doc | ||
draganddrop | ||
effects | ||
gestures | ||
graphicsview | ||
itemviews | ||
layouts | ||
mac | ||
mainwindows | ||
painting | ||
richtext | ||
scroller | ||
statemachine | ||
tools | ||
tutorials | ||
widgets | ||
windowcontainer | ||
widgets.pro |