942ab49072
Conflicts: src/corelib/tools/tools.pri Change-Id: I705630f9cecbf0ce51a22fc6116b8c49611259e9 |
||
---|---|---|
.. | ||
BLACKLIST | ||
qwindow.pro | ||
tst_qwindow.cpp |
942ab49072
Conflicts: src/corelib/tools/tools.pri Change-Id: I705630f9cecbf0ce51a22fc6116b8c49611259e9 |
||
---|---|---|
.. | ||
BLACKLIST | ||
qwindow.pro | ||
tst_qwindow.cpp |