QMake build with no_plugin_name_prefix does not work with separate_debug_info

I try to build a ".so" plugin without the "lib" prefix, and separate debug info, so I build with something like:

TEMPLATE=lib
TARGET=CtrlLDAP
CONFIG += no_plugin_name_prefix separate_debug_info

I get an error when the target .so is being stripped, because the subject for it still contains the "lib" prefix. This bug is very similar to QTBUG-47065 - the fix therein is actually not sufficient:
https://codereview.qt-project.org/#/c/120841/

The actual code in resolve_target.prf should be something like

58: } else: plugin|unversioned_libname|no_plugin_name_prefix {	
59:  QMAKE_RESOLVED_TARGET = $${QMAKE_RESOLVED_TARGET}$${TARGET}.so

or, to be explicit:
1) the else statement in line 58 should also take into account the "no_plugin_name_prefix" config option
2) line 59 should actuall set name without the $${LIBPREFIX}