diff options
Diffstat (limited to 'src/plugins/CommandLineOptions/StatusOption')
3 files changed, 3 insertions, 17 deletions
diff --git a/src/plugins/CommandLineOptions/StatusOption/CMakeLists.txt b/src/plugins/CommandLineOptions/StatusOption/CMakeLists.txt index d04371f8a..b3bdec669 100644 --- a/src/plugins/CommandLineOptions/StatusOption/CMakeLists.txt +++ b/src/plugins/CommandLineOptions/StatusOption/CMakeLists.txt @@ -1,20 +1,7 @@ project(statusoption) -# 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_SOURCE_DIR}/../../../ -) - # libqmmpui include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui) @@ -26,7 +13,7 @@ SET(statusoption_SRCS SET(statusoption_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(statusoption_RCC_SRCS ${statusoption_RCCS}) +QT5_ADD_RESOURCES(statusoption_RCC_SRCS ${statusoption_RCCS}) # Don't forget to include output directory, otherwise @@ -35,5 +22,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(statusoption MODULE ${statusoption_SRCS} ${statusoption_RCC_SRCS}) add_dependencies(statusoption qmmpui) -target_link_libraries(statusoption ${QT_LIBRARIES} qmmpui libqmmp) +target_link_libraries(statusoption Qt5::Widgets -lqmmpui -lqmmp) install(TARGETS statusoption DESTINATION ${LIB_DIR}/qmmp/CommandLineOptions) diff --git a/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp b/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp index 0450418c4..b2884fc76 100644 --- a/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp +++ b/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp @@ -139,5 +139,3 @@ QString StatusOption::genProgressBar() } return out; } - -Q_EXPORT_PLUGIN2(statusoption, StatusOption) diff --git a/src/plugins/CommandLineOptions/StatusOption/statusoption.h b/src/plugins/CommandLineOptions/StatusOption/statusoption.h index 840c6ca4a..1764aa136 100644 --- a/src/plugins/CommandLineOptions/StatusOption/statusoption.h +++ b/src/plugins/CommandLineOptions/StatusOption/statusoption.h @@ -34,6 +34,7 @@ class StatusOption : public QObject, public CommandLineOption { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.CommandLineOptionInterface.1.0") Q_INTERFACES(CommandLineOption) public: virtual bool identify(const QString& opt_str) const; |