qt5base-lts/tests/auto/corelib/tools/qsharedpointer
Liang Qi 8f569c740a Merge remote-tracking branch 'origin/5.5' into 5.6
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
2016-01-19 10:03:01 +01:00
..
.gitignore Moving relevant tests to corelib/tools 2011-09-01 13:07:23 +02:00
externaltests.cpp tst_QSharedPointer: Add jom.exe to the list of make tools to be searched. 2015-10-02 09:34:35 +00:00
externaltests.h Update copyright headers 2015-02-11 06:49:51 +00:00
externaltests.pri remove pointless conditional defines 2015-11-16 14:40:20 +00:00
forwarddeclared.cpp Update copyright headers 2015-02-11 06:49:51 +00:00
forwarddeclared.h Update copyright headers 2015-02-11 06:49:51 +00:00
nontracked.cpp Update copyright headers 2015-02-11 06:49:51 +00:00
nontracked.h Update copyright headers 2015-02-11 06:49:51 +00:00
qsharedpointer.pro Don't increase the reference count if dynamic_cast failed 2013-01-04 17:30:19 +01:00
tst_qsharedpointer.cpp Merge remote-tracking branch 'origin/5.5' into 5.6 2016-01-19 10:03:01 +01:00
wrapper.cpp Update copyright headers 2015-02-11 06:49:51 +00:00
wrapper.h Update copyright headers 2015-02-11 06:49:51 +00:00