Conflicts:
src/widgets/widgets/qmainwindowlayout.cpp
Change-Id: I306b4f5ad11bceb336c9091241b468d455fe6bb6
|
||
|---|---|---|
| .. | ||
| stream | ||
| .gitignore | ||
| qvariant.pro | ||
| qvariant.qrc | ||
| tst_qvariant.cpp | ||
Conflicts:
src/widgets/widgets/qmainwindowlayout.cpp
Change-Id: I306b4f5ad11bceb336c9091241b468d455fe6bb6
|
||
|---|---|---|
| .. | ||
| stream | ||
| .gitignore | ||
| qvariant.pro | ||
| qvariant.qrc | ||
| tst_qvariant.cpp | ||