Skip to content

Commit 9f5f35a

Browse files
committed
Merge pull request #152 from dakcarto/patch-1
Add libqico.dylib copy and lib update to Mac app bundle for upcoming 1.8...
2 parents 369b32e + 721765e commit 9f5f35a

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

mac/cmake/1qt.cmake.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ ENDFOREACH (QFW)
5959
# Qt plugins
6060

6161
EXECUTE_PROCESS (COMMAND mkdir -p "${QPLUGDIR}/../imageformats")
62-
FOREACH (QI qgif;qjpeg;qsvg;qtiff)
62+
FOREACH (QI qgif;qico;qjpeg;qsvg;qtiff)
6363
IF (NOT EXISTS "${QPLUGDIR}/../imageformats/lib${QI}.dylib")
6464
EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "@QT_PLUGINS_DIR@/imageformats/lib${QI}.dylib" "${QPLUGDIR}/../imageformats/lib${QI}.dylib")
6565
ENDIF ()
@@ -177,7 +177,7 @@ FOREACH (QFW ${QTLISTQG})
177177
IF (@OSX_HAVE_LOADERPATH@)
178178
SET (QFW_CHG_TO "${ATLOADER}/@QGIS_PLUGIN_SUBDIR_REV@/${QGIS_FW_SUBDIR}/${LIBPOST}")
179179
ENDIF ()
180-
FOREACH (QI qgif;qjpeg;qsvg;qtiff)
180+
FOREACH (QI qgif;qico;qjpeg;qsvg;qtiff)
181181
INSTALLNAMETOOL_CHANGE ("${QFW_CHG}" "${QFW_CHG_TO}" "${QPLUGDIR}/../imageformats/lib${QI}.dylib")
182182
ENDFOREACH (QI)
183183
FOREACH (QC cn;jp;kr;tw)

0 commit comments

Comments
 (0)