Merge pull request #404 from xsacha/master

Qt update
wxRemoval: Ini.cpp