1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-30 09:10:53 +02:00

Qt5 / Mac fixes.

This commit is contained in:
Christian Muehlhaeuser
2014-10-29 05:40:40 +01:00
parent 2135b99ccd
commit 4faf2c59b4
3 changed files with 23 additions and 19 deletions

View File

@@ -441,19 +441,11 @@ IF( APPLE )
mac/FileHelpers.mm
widgets/SourceTreePopupDialog_mac.mm )
if( BUILD_WITH_QT4 )
list(APPEND libSources
thirdparty/Qocoa/qbutton_mac.mm
thirdparty/Qocoa/qsearchfield_mac.mm
thirdparty/Qocoa/qtoolbartabdialog_mac.mm
)
else()
list(APPEND libSources
thirdparty/Qocoa/qbutton.cpp
thirdparty/Qocoa/qsearchfield.cpp
thirdparty/Qocoa/qtoolbartabdialog.cpp
)
endif()
list(APPEND libSources
thirdparty/Qocoa/qbutton_mac.mm
thirdparty/Qocoa/qsearchfield_mac.mm
thirdparty/Qocoa/qtoolbartabdialog_mac.mm
)
SET_SOURCE_FILES_PROPERTIES(utils/TomahawkUtils_Mac.mm PROPERTIES COMPILE_FLAGS "-fvisibility=default")
@@ -492,6 +484,9 @@ set_target_properties(
qt5_use_modules(tomahawklib Widgets Network Sql WebKitWidgets Concurrent Xml UiTools Svg)
IF(APPLE)
qt5_use_modules(tomahawklib MacExtras)
ENDIF()
IF(QCA2_FOUND)
LIST(APPEND LINK_LIBRARIES ${QCA2_LIBRARIES} )

View File

@@ -167,6 +167,9 @@ SET_TARGET_PROPERTIES(tomahawk_bin
qt5_use_modules(tomahawk_bin Core Widgets Network Sql WebKitWidgets)
if(APPLE)
qt5_use_modules(tomahawk_bin MacExtras)
endif()
if(WIN32)
qt5_use_modules(tomahawk_bin WinExtras)
endif()