[qt5-qtxmlpatterns/f21] (3 commits) ...fix incomplete merge

[Rex Dieter]

Summary of changes:

  1704c88... 5.3.2 (*)
  df82222... Merge branch 'el6' (*)
  ff3a6af... fix incomplete merge (*)

(*) This commit already existed in another branch; no separate mail sent