Conflicts: tests/auto/quick/qquicktextedit/BLACKLIST Change-Id: I0b9e5bea5da5d2666887c202e62d889b4aa56900 |
||
---|---|---|
.. | ||
data | ||
qquicktextedit.pro | ||
tst_qquicktextedit.cpp |
Conflicts: tests/auto/quick/qquicktextedit/BLACKLIST Change-Id: I0b9e5bea5da5d2666887c202e62d889b4aa56900 |
||
---|---|---|
.. | ||
data | ||
qquicktextedit.pro | ||
tst_qquicktextedit.cpp |