Merge branch 'replacing-cmake-with-qmake' of ssh://deng.git.sourceforge.net/gitroot/deng/deng into replacing-cmake-with-qmake
Merge branch 'replacing-cmake-with-qmake' of ssh://deng.git.sourceforge.net/gitroot/deng/deng into replacing-cmake-with-qmake