diff options
Diffstat (limited to 'src/plugins/Transports/mms')
| -rw-r--r-- | src/plugins/Transports/mms/CMakeLists.txt | 19 | ||||
| -rw-r--r-- | src/plugins/Transports/mms/mmsinputfactory.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/Transports/mms/mmsinputfactory.h | 1 |
3 files changed, 4 insertions, 17 deletions
diff --git a/src/plugins/Transports/mms/CMakeLists.txt b/src/plugins/Transports/mms/CMakeLists.txt index 106c2f796..2bcf19141 100644 --- a/src/plugins/Transports/mms/CMakeLists.txt +++ b/src/plugins/Transports/mms/CMakeLists.txt @@ -1,20 +1,7 @@ project(libmms) -# qt plugin -ADD_DEFINITIONS( -Wall ) -ADD_DEFINITIONS(${QT_DEFINITIONS}) -ADD_DEFINITIONS(-DQT_PLUGIN) -ADD_DEFINITIONS(-DQT_NO_DEBUG) -ADD_DEFINITIONS(-DQT_SHARED) -ADD_DEFINITIONS(-DQT_THREAD) - include_directories(${CMAKE_CURRENT_BINARY_DIR}) -SET(QT_INCLUDES - ${QT_INCLUDES} - ${CMAKE_CURRENT_BINARY_DIR}/../../../ -) - # libqmmp include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp) @@ -35,13 +22,13 @@ SET(libmms_SRCS # resources SET(libmms_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libmms_RCC_SRCS ${libmms_RCCS}) +QT5_ADD_RESOURCES(libmms_RCC_SRCS ${libmms_RCCS}) # user interface SET(libmms_UIS settingsdialog.ui ) -QT4_WRAP_UI(libmms_UIS_H ${libmms_UIS}) +QT5_WRAP_UI(libmms_UIS_H ${libmms_UIS}) # Don't forget to include output directory, otherwise @@ -49,7 +36,7 @@ QT4_WRAP_UI(libmms_UIS_H ${libmms_UIS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(MMS_FOUND) ADD_LIBRARY(mms MODULE ${libmms_SRCS} ${libmms_UIS_H} ${libmms_RCC_SRCS}) -target_link_libraries(mms ${QT_LIBRARIES} libqmmp ${MMS_LDFLAGS}) +target_link_libraries(mms Qt5::Widgets -lqmmp ${MMS_LDFLAGS}) add_dependencies(mms qmmp) install(TARGETS mms DESTINATION ${LIB_DIR}/qmmp/Transports) ENDIF(MMS_FOUND) diff --git a/src/plugins/Transports/mms/mmsinputfactory.cpp b/src/plugins/Transports/mms/mmsinputfactory.cpp index d51eee4d6..2dc0c84bf 100644 --- a/src/plugins/Transports/mms/mmsinputfactory.cpp +++ b/src/plugins/Transports/mms/mmsinputfactory.cpp @@ -62,4 +62,3 @@ QTranslator *MMSInputFactory::createTranslator(QObject *parent) translator->load(QString(":/mms_plugin_") + locale); return translator; } -Q_EXPORT_PLUGIN2(mms, MMSInputFactory) diff --git a/src/plugins/Transports/mms/mmsinputfactory.h b/src/plugins/Transports/mms/mmsinputfactory.h index 25a1fe070..3b6e8576c 100644 --- a/src/plugins/Transports/mms/mmsinputfactory.h +++ b/src/plugins/Transports/mms/mmsinputfactory.h @@ -33,6 +33,7 @@ class QTranslator; class MMSInputFactory : public QObject, InputSourceFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.InputSourceFactoryInterface.1.0") Q_INTERFACES(InputSourceFactory) public: const InputSourceProperties properties() const; |
