CMake: specific modules for Qt5

diff --git a/src/frontends/qt4/CMakeLists.txt b/src/frontends/qt4/CMakeLists.txt
index 14283ea0b2f63f99d1085c7d7373398ba2ce5268..16d8b515ecd7e07bb47688761d81540bb848a18d 100644 (file)
--- 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 04eb38e3f409c09432e89aabcc0c52794f75576b..b0916b51f917b3589b6ab0ded9c37a56e70d3211 100644 (file)
--- 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})