2eb26c1709
Conflicts: src/gui/text/qfontdatabase.cpp Change-Id: I6ac1f55faa22b8e7b591386fb67f0333d0ea443d |
||
---|---|---|
.. | ||
dialogs | ||
effects | ||
gestures | ||
graphicsview | ||
itemviews | ||
kernel | ||
styles | ||
util | ||
widgets | ||
widgets.pro |
2eb26c1709
Conflicts: src/gui/text/qfontdatabase.cpp Change-Id: I6ac1f55faa22b8e7b591386fb67f0333d0ea443d |
||
---|---|---|
.. | ||
dialogs | ||
effects | ||
gestures | ||
graphicsview | ||
itemviews | ||
kernel | ||
styles | ||
util | ||
widgets | ||
widgets.pro |