29f01b32f5
Conflicts: src/corelib/configure.json Change-Id: I93ac67f3bf4844bc7c691183e94bceb922b7b919 |
||
---|---|---|
.. | ||
BLACKLIST | ||
qtimezone.pro | ||
tst_qtimezone_darwin.mm | ||
tst_qtimezone.cpp |
29f01b32f5
Conflicts: src/corelib/configure.json Change-Id: I93ac67f3bf4844bc7c691183e94bceb922b7b919 |
||
---|---|---|
.. | ||
BLACKLIST | ||
qtimezone.pro | ||
tst_qtimezone_darwin.mm | ||
tst_qtimezone.cpp |