-Fix categories which got mixed up during juggling with different repos. -Remove NO_FILTER_SHLIBS, which disappeared shortly before Qt4 was committed. Noticed by: erwin, pav