From 0933df00113ee2735699c13559ad3b6e7e9fd115 Mon Sep 17 00:00:00 2001 From: Stephan Witt Date: Tue, 19 May 2015 08:11:01 +0200 Subject: [PATCH] Add Qt's Svg module to the list of used modules. This is required to allow the use of e.g. the QSvgRenderer class. --- config/qt4.m4 | 4 ++-- src/frontends/qt4/CMakeLists.txt | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/qt4.m4 b/config/qt4.m4 index daa11718ee..75b10d0b9c 100644 --- a/config/qt4.m4 +++ b/config/qt4.m4 @@ -44,7 +44,7 @@ AC_DEFUN([QT_CHECK_COMPILE], done qt_cv_libname= 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' do QT_TRY_LINK($libname) @@ -269,7 +269,7 @@ AC_DEFUN([QT_DO_MANUAL_CONFIG], QT_CORE_LDFLAGS= if test -n "$qt_cv_includes"; then 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" done QT_CORE_INCLUDES="-I$qt_cv_includes -I$qt_cv_includes/QtCore" diff --git a/src/frontends/qt4/CMakeLists.txt b/src/frontends/qt4/CMakeLists.txt index 3af2e865fd..833e92a9e3 100644 --- a/src/frontends/qt4/CMakeLists.txt +++ b/src/frontends/qt4/CMakeLists.txt @@ -56,12 +56,12 @@ endif() set_target_properties(frontend_qt PROPERTIES FOLDER "applications/LyX") 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() 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() - qt_use_modules(frontend_qt Core Gui Widgets Concurrent) + qt_use_modules(frontend_qt Core Gui Widgets Concurrent Svg) endif() endif() target_link_libraries(frontend_qt -- 2.39.2