b1a216649e
Conflicts: qmake/generators/makefile.cpp qmake/generators/unix/unixmake2.cpp src/corelib/thread/qthread_unix.cpp tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp Change-Id: I1df0d4ba20685de7f9300bf07458c13376493408 |
||
---|---|---|
.. | ||
testdata/paintEvent | ||
.gitignore | ||
BLACKLIST | ||
geometry-fullscreen.dat | ||
geometry-maximized.dat | ||
geometry.dat | ||
qwidget.pro | ||
qwidget.qrc | ||
tst_qwidget_mac_helpers.h | ||
tst_qwidget_mac_helpers.mm | ||
tst_qwidget.cpp |