8f569c740a
Conflicts: config.tests/common/atomic64/atomic64.cpp configure src/3rdparty/forkfd/forkfd.c src/corelib/io/forkfd_qt.cpp src/widgets/kernel/qwidgetwindow.cpp tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp tools/configure/configureapp.cpp Change-Id: Ic6168d82e51a0ef1862c3a63bee6722e8f138414 |
||
---|---|---|
.. | ||
.gitignore | ||
externaltests.cpp | ||
externaltests.h | ||
externaltests.pri | ||
forwarddeclared.cpp | ||
forwarddeclared.h | ||
nontracked.cpp | ||
nontracked.h | ||
qsharedpointer.pro | ||
tst_qsharedpointer.cpp | ||
wrapper.cpp | ||
wrapper.h |