anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add Qt's Svg module to the list of used modules. This is required to allow the use of e.g. the QSvgRenderer class.

Browse Source
This commit is contained in:
Stephan Witt 2015-05-19 08:11:01 +02:00
parent 82e4dbc48e
commit 0933df0011
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/qt4.m4
View File

@ -44,7 +44,7 @@ AC_DEFUN([QT_CHECK_COMPILE],
done done
qt_cv_libname= qt_cv_libname=
for libname in $qt_guilibs \ for libname in $qt_guilibs \
'-framework QtCore -framework QtConcurrent -framework QtWidgets -framework QtMacExtras -framework QtGui'\ '-framework QtCore -framework QtConcurrent -framework QtSvg -framework QtWidgets -framework QtMacExtras -framework QtGui'\
'-framework QtCore -framework QtGui' '-framework QtCore -framework QtGui'
do do
QT_TRY_LINK($libname) QT_TRY_LINK($libname)
@ -269,7 +269,7 @@ AC_DEFUN([QT_DO_MANUAL_CONFIG],
QT_CORE_LDFLAGS= QT_CORE_LDFLAGS=
if test -n "$qt_cv_includes"; then if test -n "$qt_cv_includes"; then
QT_INCLUDES="-I$qt_cv_includes" QT_INCLUDES="-I$qt_cv_includes"
for i in Qt QtCore QtGui QtWidgets QtConcurrent QtMacExtras; do for i in Qt QtCore QtGui QtWidgets QtSvg QtConcurrent QtMacExtras; do
QT_INCLUDES="$QT_INCLUDES -I$qt_cv_includes/$i" QT_INCLUDES="$QT_INCLUDES -I$qt_cv_includes/$i"
done done
QT_CORE_INCLUDES="-I$qt_cv_includes -I$qt_cv_includes/QtCore" QT_CORE_INCLUDES="-I$qt_cv_includes -I$qt_cv_includes/QtCore"

6
src/frontends/qt4/CMakeLists.txt
View File

@ -56,12 +56,12 @@ endif()
set_target_properties(frontend_qt PROPERTIES FOLDER "applications/LyX") set_target_properties(frontend_qt PROPERTIES FOLDER "applications/LyX")
if(Qt5Core_FOUND AND APPLE) if(Qt5Core_FOUND AND APPLE)
qt_use_modules(frontend_qt Core Gui Widgets Concurrent MacExtras) qt_use_modules(frontend_qt Core Gui Widgets Concurrent Svg MacExtras)
else() else()
if (Qt5WinExtras_FOUND) if (Qt5WinExtras_FOUND)
qt_use_modules(frontend_qt Core Gui Widgets Concurrent WinExtras) qt_use_modules(frontend_qt Core Gui Widgets Concurrent Svg WinExtras)
else() else()
qt_use_modules(frontend_qt Core Gui Widgets Concurrent) qt_use_modules(frontend_qt Core Gui Widgets Concurrent Svg)
endif() endif()
endif() endif()
target_link_libraries(frontend_qt target_link_libraries(frontend_qt