Skip to content
Permalink
Browse files

Add libqico.dylib copy and lib update to Mac app bundle for upcoming …

…1.8 release. Linux already supports libqico (favicons), while Windows apparently isn't supported by Qt yet (Notes section of http://qt-project.org/doc/qt-4.8/qtwebkit.html ). This is useful for plugins that render web pages and want to display the favicon of the site.
  • Loading branch information
dakcarto committed May 28, 2012
1 parent 369b32e commit 721765e5ee618a2a0bc1fdaab9a1e6c6f62e4b6c
Showing with 2 additions and 2 deletions.
  1. +2 −2 mac/cmake/1qt.cmake.in
@@ -59,7 +59,7 @@ ENDFOREACH (QFW)
# Qt plugins

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

0 comments on commit 721765e

Please sign in to comment.
You can’t perform that action at this time.