Skip to content

Commit 721765e

Browse files
committedMay 28, 2012
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.
1 parent 369b32e commit 721765e

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed
 

‎mac/cmake/1qt.cmake.in

Lines changed: 2 additions & 2 deletions
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)
Please sign in to comment.