From 75211131aafebebb900cf5bde8209bd5f8b3f84d Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Thu, 18 Aug 2016 03:16:33 -0700 Subject: [PATCH] qmake: handle QMAKE_PLUGIN_BUNDLE_NAME in resolve_target.prf Change-Id: I532dcc4a6595f8b3c8371225cc4fb46fe38d8762 Reviewed-by: Oswald Buddenhagen --- mkspecs/features/resolve_target.prf | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/mkspecs/features/resolve_target.prf b/mkspecs/features/resolve_target.prf index 629a02a4f3..8678c33ecd 100644 --- a/mkspecs/features/resolve_target.prf +++ b/mkspecs/features/resolve_target.prf @@ -32,7 +32,17 @@ win32 { mac { equals(TEMPLATE, lib) { - lib_bundle { + plugin:plugin_bundle { + !isEmpty(QMAKE_PLUGIN_BUNDLE_NAME): \ + plugin_target = $$QMAKE_PLUGIN_BUNDLE_NAME + else: \ + plugin_target = $$TARGET + QMAKE_RESOLVED_BUNDLE = $${QMAKE_RESOLVED_TARGET}$${plugin_target}.plugin + !shallow_bundle: \ + QMAKE_RESOLVED_TARGET = $${QMAKE_RESOLVED_BUNDLE}/Contents/MacOS/$${TARGET} + else: \ + QMAKE_RESOLVED_TARGET = $${QMAKE_RESOLVED_BUNDLE}$${TARGET} + } else: !plugin:lib_bundle { !isEmpty(QMAKE_FRAMEWORK_BUNDLE_NAME): \ framework_target = $$QMAKE_FRAMEWORK_BUNDLE_NAME else: \