29f01b32f5
Conflicts: src/corelib/configure.json Change-Id: I93ac67f3bf4844bc7c691183e94bceb922b7b919 |
||
---|---|---|
.. | ||
dialogs | ||
effects | ||
graphicsview | ||
itemviews | ||
kernel | ||
styles | ||
util | ||
widgets | ||
widgets.pro |
29f01b32f5
Conflicts: src/corelib/configure.json Change-Id: I93ac67f3bf4844bc7c691183e94bceb922b7b919 |
||
---|---|---|
.. | ||
dialogs | ||
effects | ||
graphicsview | ||
itemviews | ||
kernel | ||
styles | ||
util | ||
widgets | ||
widgets.pro |