Revert "Temporarily fix qtlocation against a non-broken qtbase."

This reverts commit 6603fae80a7a5d6e610668c418f4ff983cfd38dc

qtbase is fixed now

Change-Id: I9216bb7a947fc9c7b5c42d7a31a150800699b303
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>