Squish: Fix and improve __selectQtVersionDesktop__

Change-Id: I05e0038f8baf134e6d01d829bd52812b9128dd60
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Squish: Generalize stabilization of tst_CSUP04

Change-Id: Id56420161cc80acc4057a56f62af5d33acf2eef7
Reviewed-by: Christian Stenger <christian.stenger@digia.com>