AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
beb65dcd79
qt5base-lts/tests/auto/corelib/tools/qsharedpointer
History
Liang Qi beb65dcd79 Merge remote-tracking branch 'origin/5.6' into dev 
Conflicts:
	src/gui/painting/painting.pri
	src/plugins/platforms/xcb/qxcbconnection.cpp
	tests/auto/corelib/thread/qthreadstorage/qthreadstorage.pro
	tests/auto/corelib/tools/qlocale/test/test.pro
	tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
	tools/configure/environment.cpp

Change-Id: I9c40f458b89b2c206de2d2c24e90b5f679c93495
2015-12-18 08:37:31 +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 Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
tst_qsharedpointer.cpp Merge remote-tracking branch 'origin/5.6' into dev 2015-12-18 08:37:31 +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