whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/tests/auto
History
Liang Qi 4fe2fbcf82 Merge remote-tracking branch 'origin/5.6' into 5.7 
This also reverts commit 018e670a26.

The change was introduced in 5.6. After the refactoring, 14960f52,
in 5.7 branch and a merge, it is not needed any more.

Conflicts:
	.qmake.conf
	src/corelib/io/qstandardpaths_mac.mm
	src/corelib/tools/qsharedpointer_impl.h
	tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp

Change-Id: If4fdff0ebf2b9b5df9f9db93ea0022d5ee3da2a4
 		2016-02-18 20:50:35 +01:00
..
android Updated license headers 2016-01-21 18:55:18 +00:00
bic/data bic: Add 5.{1,2,3,4}.0 bic data for linux-gcc-amd64 2015-02-14 06:54:20 +00:00
cmake Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev 2016-01-26 11:27:37 +00:00
compilerwarnings/data Updated license headers 2016-01-21 18:55:18 +00:00
concurrent QtConcurrentRun: add unittest for polling for isFinished() 2016-02-15 13:53:57 +00:00
corelib Merge remote-tracking branch 'origin/5.6' into 5.7 2016-02-18 20:50:35 +01:00
dbus Merge remote-tracking branch 'origin/5.6' into dev 2016-02-02 15:57:44 +01:00
gui Merge remote-tracking branch 'origin/5.6' into 5.7 2016-02-18 20:50:35 +01:00
guiapplauncher Fix path to examples part of tst_GuiAppLauncher 2015-02-13 07:28:15 +00:00
installed_cmake Add a unit test for testing Qt in its install location. 2013-07-02 23:08:54 +02:00
network Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev 2016-01-26 19:40:45 +00:00
opengl Merge remote-tracking branch 'origin/5.6' into 5.7 2016-02-18 20:50:35 +01:00
other Merge remote-tracking branch 'origin/5.6' into 5.7 2016-02-18 20:50:35 +01:00
printsupport Updated license headers 2016-01-21 18:55:18 +00:00
shared Updated license headers 2016-01-21 18:55:18 +00:00
sql Merge remote-tracking branch 'origin/5.6' into 5.7 2016-02-18 20:50:35 +01:00
testlib Add TeamCity logging feature to testlib 2016-01-23 18:30:58 +00:00
tools uic: Accept an -idbased argument 2016-01-28 14:07:43 +00:00
widgets Merge remote-tracking branch 'origin/5.6' into 5.7 2016-02-18 20:50:35 +01:00
xml Updated license headers 2016-01-21 18:55:18 +00:00
auto.pro Merge remote-tracking branch 'origin/5.6' into dev 2015-09-25 14:02:04 +02:00
network-settings.h Updated license headers 2016-01-21 18:55:18 +00:00
qtest-config.h Updated license headers 2016-01-21 18:55:18 +00:00
test.pl Updated license headers 2016-01-21 18:55:18 +00:00