updating build vars
merging scilux into qt4
minor cleanup before merge
merging scilux and qt4 branch; keeping scilux incase