Fix ALTERNATIVE_QT_INCLUDE_DIR to set both the include and lib folders
Merge branch 'osx-fixes' into dev