AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
dbef41f43e
qt5base-lts/examples/widgets/tools
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
..
codecs Unify license header usage. 2016-03-29 10:20:03 +00:00
completer Unify license header usage. 2016-03-29 10:20:03 +00:00
customcompleter Unify license header usage. 2016-03-29 10:20:03 +00:00
echoplugin Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-06 15:36:44 +02:00
i18n Unify license header usage. 2016-03-29 10:20:03 +00:00
plugandpaint Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-06 15:36:44 +02:00
regexp Unify license header usage. 2016-03-29 10:20:03 +00:00
regularexpression Unify license header usage. 2016-03-29 10:20:03 +00:00
settingseditor Unify license header usage. 2016-03-29 10:20:03 +00:00
styleplugin Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-06 15:36:44 +02:00
treemodelcompleter Unify license header usage. 2016-03-29 10:20:03 +00:00
undo Updated license headers 2016-01-21 18:55:32 +00:00
undoframework Unify license header usage. 2016-03-29 10:20:03 +00:00
tools.pro Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-06 15:36:44 +02:00