whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/tests/auto
History
Liang Qi dbef41f43e Merge remote-tracking branch 'origin/5.6' into 5.7 
Conflicts:
	examples/qtestlib/tutorial5/containers.cpp
	examples/widgets/tools/tools.pro
	src/corelib/io/qprocess.cpp
	src/corelib/io/qprocess_unix.cpp
	src/corelib/io/qprocess_win.cpp
	src/network/kernel/qdnslookup_unix.cpp
	src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
	src/testlib/qtestcase.cpp
	tools/configure/configureapp.cpp

Change-Id: I838ae7f082535a67a4a53aa13a21ba5580758be8
 		2016-05-06 15:36:44 +02: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 remote-tracking branch 'origin/5.6' into 5.7 2016-04-04 08:59:18 +02: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-05-06 15:36:44 +02:00
dbus Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-29 17:55:20 +02:00
gui Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-06 15:36:44 +02:00
guiapplauncher Fix path to examples part of tst_GuiAppLauncher 2015-02-13 07:28:15 +00:00
installed_cmake
…
network Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-06 15:36:44 +02:00
opengl Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-04 08:59:18 +02:00
other Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-29 17:55:20 +02:00
printsupport Merge remote-tracking branch 'origin/5.6' into 5.7 2016-02-29 12:34:31 +01: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-03-21 09:02:57 +01:00
testlib QtTest/generate_expected_output.py: Add TeamCity logging format. 2016-03-17 17:29:14 +00:00
tools make extra compiler targets depend on their respective compiler 2016-04-18 09:38:10 +00:00
widgets Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-06 15:36:44 +02:00
xml Updated license headers 2016-01-21 18:55:18 +00:00
auto.pro Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-04 08:59:18 +02:00
network-settings.h Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-06 15:36:44 +02: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