diff --git a/libs/qscintilla/Qt4Qt5/CMakeLists.txt b/libs/qscintilla/Qt4Qt5/CMakeLists.txt index 28c16897..d4645224 100644 --- a/libs/qscintilla/Qt4Qt5/CMakeLists.txt +++ b/libs/qscintilla/Qt4Qt5/CMakeLists.txt @@ -10,6 +10,10 @@ else() add_definitions(${QT_DEFINITIONS}) endif() +if(APPLE AND USE_QT5) + find_package(Qt5MacExtras) +endif() + add_definitions(-DSCINTILLA_QT) add_definitions(-DSCI_LEXER) @@ -154,5 +158,9 @@ include_directories(. ../include ../lexlib ../src) add_library(qscintilla2 ${QSCINTILLA_SRC} ${QSCINTILLA_HDR} ${QSCINTILLA_MOC_HDR} ${QSCINTILLA_MOC}) if(USE_QT5) - qt5_use_modules(qscintilla2 Widgets PrintSupport) + if (APPLE) + qt5_use_modules(qscintilla2 Widgets PrintSupport MacExtras) + else() + qt5_use_modules(qscintilla2 Widgets PrintSupport) + endif() endif() diff --git a/src/src.pro b/src/src.pro index 376577ef..c3da61b8 100644 --- a/src/src.pro +++ b/src/src.pro @@ -145,8 +145,9 @@ win32 { } mac { RC_FILE = macapp.icns - INCLUDEPATH += -I/usr/local/include \ - -I/usr/local/opt/sqlite/include + QT+= macextras + INCLUDEPATH += /usr/local/include \ + /usr/local/opt/sqlite/include LIBS += -L/usr/local/lib \ -L/usr/local/opt/sqlite/lib \ -framework Carbon