From: Benjamin Piwowarski <benjamin@bpiwowar.net>
Date: Sun, 9 Mar 2014 09:24:41 +0000 (+0100)
Subject: CMake: specific modules for Qt5
X-Git-Tag: 2.2.0alpha1~2071
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=2da0d3277165bb8a6ea1049460c3a161f74017fc;p=features.git

CMake: specific modules for Qt5
---

diff --git a/src/frontends/qt4/CMakeLists.txt b/src/frontends/qt4/CMakeLists.txt
index 14283ea0b2..16d8b515ec 100644
--- a/src/frontends/qt4/CMakeLists.txt
+++ b/src/frontends/qt4/CMakeLists.txt
@@ -54,7 +54,11 @@ else()
 endif()
 set_target_properties(frontend_qt4 PROPERTIES FOLDER "applications/LyX")
 
-qt_use_modules(frontend_qt4 Core Gui Widgets Concurrent)
+if(Qt5Core_FOUND AND APPLE)
+       qt_use_modules(frontend_qt4 Core Gui Widgets Concurrent MacExtras)
+else()
+       qt_use_modules(frontend_qt4 Core Gui Widgets Concurrent)
+endif()
 target_link_libraries(frontend_qt4
 	frontends
 	${QT_QTCORE_LIBRARY}
diff --git a/src/support/CMakeLists.txt b/src/support/CMakeLists.txt
index 04eb38e3f4..b0916b51f9 100644
--- a/src/support/CMakeLists.txt
+++ b/src/support/CMakeLists.txt
@@ -74,7 +74,11 @@ else()
 endif()
 set_target_properties(support PROPERTIES FOLDER "applications/LyX")
 
-qt_use_modules(support Core)
+if(USE_MACOSX_PACKAGING AND Qt5Core_FOUND)
+       qt_use_modules(support Core Gui)
+else()
+       qt_use_modules(support Core)
+endif()
 
 target_link_libraries(support ${Lyx_Boost_Libraries} ${QT_QTCORE_LIBRARY} ${ZLIB_LIBRARY})