Merge "Fix install flag overlap" into qt-dev