Skip to content

Commit 857ad0a

Browse files
kyngchaosnyalldawson
authored andcommitted
handle quick for Mac bundling
1 parent 97a6815 commit 857ad0a

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

cmake/MacBundleMacros.cmake

+5
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,11 @@ FUNCTION (UPDATEQGISPATHS LIBFROM LIBTO)
166166
FOREACH (QP ${QGPLUGLIST})
167167
INSTALLNAMETOOL_CHANGE ("${LIBFROM}" "${LIB_CHG_TO}" "${QP}")
168168
ENDFOREACH (QP)
169+
# quick plugin
170+
IF (${OSX_HAVE_LOADERPATH})
171+
SET (LIB_CHG_TO "${ATLOADER}/../../${LIBMID}/${LIBPOST}")
172+
ENDIF ()
173+
INSTALLNAMETOOL_CHANGE ("${LIBFROM}" "${LIB_CHG_TO}" "${QAPPDIR}/qml/QgsQuick/libqgis_quick_plugin.dylib")
169174
# qgis python
170175
IF (${OSX_HAVE_LOADERPATH})
171176
SET (LIB_CHG_TO "${ATLOADER}/../../${QGIS_DATA_SUBDIR_REV}/${LIBMID}/${LIBPOST}")

mac/cmake/1qt.cmake.in

+5
Original file line numberDiff line numberDiff line change
@@ -505,6 +505,11 @@ FOREACH (QFW ${QTLISTQG})
505505
INSTALLNAMETOOL_CHANGE ("${QFW_CHG}" "${QFW_CHG_TO}" "${QPLUGDIR}/../iconengines/libqsvgicon.dylib")
506506
INSTALLNAMETOOL_CHANGE ("${QFW_CHG}" "${QFW_CHG_TO}" "${QPLUGDIR}/../phonon_backend/libphonon_qt7.dylib")
507507
INSTALLNAMETOOL_CHANGE ("${QFW_CHG}" "${QFW_CHG_TO}" "${QPLUGDIR}/../styles/libqmacstyle.dylib")
508+
# quick plugin
509+
IF (@OSX_HAVE_LOADERPATH@)
510+
SET (QFW_CHG_TO "${ATLOADER}/../../../${LIBPOST}")
511+
ENDIF ()
512+
INSTALLNAMETOOL_CHANGE ("${QFW_CHG}" "${QFW_CHG_TO}" "${QAPPDIR}/qml/QgsQuick/libqgis_quick_plugin.dylib")
508513
# qt fw
509514
IF (@OSX_HAVE_LOADERPATH@)
510515
SET (QFW_CHG_TO "${ATLOADER}/../../../${LIBPOST}")

0 commit comments

Comments
 (0)