Adjusted makefiles and patches.
squashed some changes from orgad:
https://codereview.qt-project.org/#change,35419



Change-Id: I380e0199f1dca971b6018f6501e87070ee79fc76
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <qthjk@ovi.com>