"qtLibraryTarget" output changed from Qt 5.3.2 to Qt 5.4.0

"qtLibraryTarget" output generation seems to have changed from Qt5.3.x to Qt 5.4.0 in that it now automatically adds a "5" to any TARGET value that starts with "Qt"

In other words, in my QML plugin .pro, I have the following code:

TEMPLATE = lib
TARGET = QtQmlComponents
QT += qml quick
CONFIG += qt plugin

TARGET = $$qtLibraryTarget($$TARGET)

Which, for 5.3.x gave me "QtQmlComponents.dll" (on Windows obviously), but for 5.4 now gives me "Qt5QmlComponents.dll".

This breaks QML plugin imports since the dll name now no longer matches the plugin name.