Merge branch 'master' of github.com:caicai0119/qt-login

Conflicts:
	.gitignore

Signed-off-by: Tony.Nie <tony_nie@realsil.com.cn>
Merge branch 'master' of github.com:caicai0119/qt-login

Conflicts:
	.gitignore

Signed-off-by: Tony.Nie <tony_nie@realsil.com.cn>
Merge branch 'master' of github.com:TonyNie/qt-login
test for github

Signed-off-by: Tony.Nie <tony_nie@realsil.com.cn>
Merge remote-tracking branch 'origin/master' into signal

Signed-off-by: Tony Nie <cloudnie@gmail.com>

Conflicts:
	.gitignore