qt6-bb10

Commit Graph

Author	SHA1	Message	Date
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
Oswald Buddenhagen	5bbbea4c83	normalize structure of plugandpaint example as in other examples which come with plugins, use an additional hierarchy level which contains the app and plugin subdirs. Change-Id: I2487755967aa3474c337c8c8af10be49627b63d0 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>	2016-05-03 10:25:18 +00:00

Author

SHA1

Message

Date

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

Oswald Buddenhagen

5bbbea4c83

normalize structure of plugandpaint example

as in other examples which come with plugins, use an additional
hierarchy level which contains the app and plugin subdirs.

Change-Id: I2487755967aa3474c337c8c8af10be49627b63d0
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>

2016-05-03 10:25:18 +00:00

2 Commits (3d77e1396cfccff2e4cd2cab93d04c7762d28d57)