no
Merge branch 'master' of https://github.com/abc19abc91/Qt
merge

Conflicts:
	QtNavi/QtNavi.ncb
	QtNavi/QtNavi.suo
	QtNavi/QtNavi/GeneratedFiles/Debug/moc_NaviBar.cpp
	QtNavi/QtNavi/GeneratedFiles/Debug/moc_QtNaviView.cpp
	QtNavi/QtNavi/GeneratedFiles/Debug/moc_UiManager.cpp
	QtNavi/QtNavi/GeneratedFiles/qrc_qtnavi.cpp