Conflicts: mkspecs/features/uikit/xcodebuild.mk tests/auto/other/lancelot/tst_lancelot.cpp tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp Change-Id: Ia0ae2de86094120281abd445138877c2cc3e882c |
||
|---|---|---|
| .. | ||
| .gitignore | ||
| qgridlayout.pro | ||
| sortdialog.ui | ||
| tst_qgridlayout.cpp | ||