d38fe875c7
Conflicts: src/widgets/widgets/qmainwindowlayout.cpp Change-Id: I306b4f5ad11bceb336c9091241b468d455fe6bb6 |
||
---|---|---|
.. | ||
syslocaleapp | ||
test | ||
.gitignore | ||
qlocale.pro | ||
tst_qlocale.cpp |
d38fe875c7
Conflicts: src/widgets/widgets/qmainwindowlayout.cpp Change-Id: I306b4f5ad11bceb336c9091241b468d455fe6bb6 |
||
---|---|---|
.. | ||
syslocaleapp | ||
test | ||
.gitignore | ||
qlocale.pro | ||
tst_qlocale.cpp |