diff options
Diffstat (limited to 'src/plugins/CommandLineOptions')
14 files changed, 13 insertions, 70 deletions
diff --git a/src/plugins/CommandLineOptions/IncDecVolumeOption/CMakeLists.txt b/src/plugins/CommandLineOptions/IncDecVolumeOption/CMakeLists.txt index 07f86eab6..59ac695a1 100644 --- a/src/plugins/CommandLineOptions/IncDecVolumeOption/CMakeLists.txt +++ b/src/plugins/CommandLineOptions/IncDecVolumeOption/CMakeLists.txt @@ -1,20 +1,7 @@ project(libincdecvolumeoption) -# 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(libincdecvolumeoption_SRCS SET(libincdecvolumeoption_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libincdecvolumeoption_RCC_SRCS ${libincdecvolumeoption_RCCS}) +QT5_ADD_RESOURCES(libincdecvolumeoption_RCC_SRCS ${libincdecvolumeoption_RCCS}) # Don't forget to include output directory, otherwise @@ -36,5 +23,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(incdecvolumeoption MODULE ${libincdecvolumeoption_SRCS} ${libincdecvolumeoption_RCC_SRCS}) add_dependencies(incdecvolumeoption qmmpui) -target_link_libraries(incdecvolumeoption ${QT_LIBRARIES} qmmpui libqmmp) +target_link_libraries(incdecvolumeoption Qt5::Widgets -lqmmpui -lqmmp) install(TARGETS incdecvolumeoption DESTINATION ${LIB_DIR}/qmmp/CommandLineOptions) diff --git a/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.cpp b/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.cpp index d5171e20c..3153fd6f6 100644 --- a/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.cpp +++ b/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.cpp @@ -70,5 +70,3 @@ QTranslator *IncDecVolumeCommandLineOption::createTranslator(QObject *parent) translator->load(QString(":/incdecvolume_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(incdecvolumeoption, IncDecVolumeCommandLineOption) diff --git a/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.h b/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.h index 28008c8a1..ad734880d 100644 --- a/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.h +++ b/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.h @@ -31,6 +31,7 @@ class IncDecVolumeCommandLineOption : 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; diff --git a/src/plugins/CommandLineOptions/PlayListOption/CMakeLists.txt b/src/plugins/CommandLineOptions/PlayListOption/CMakeLists.txt index dfbf50cf9..4a673e24d 100644 --- a/src/plugins/CommandLineOptions/PlayListOption/CMakeLists.txt +++ b/src/plugins/CommandLineOptions/PlayListOption/CMakeLists.txt @@ -1,20 +1,7 @@ project(libplaylistoption) -# 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(libplaylistoption_SRCS SET(libplaylistoption_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libplaylistoption_RCC_SRCS ${libplaylistoption_RCCS}) +QT5_ADD_RESOURCES(libplaylistoption_RCC_SRCS ${libplaylistoption_RCCS}) # Don't forget to include output directory, otherwise @@ -36,5 +23,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(playlistoption MODULE ${libplaylistoption_SRCS} ${libplaylistoption_RCC_SRCS}) add_dependencies(playlistoption qmmpui) -target_link_libraries(playlistoption ${QT_LIBRARIES} qmmpui libqmmp) +target_link_libraries(playlistoption Qt5::Widgets -lqmmpui -lqmmp) install(TARGETS playlistoption DESTINATION ${LIB_DIR}/qmmp/CommandLineOptions) diff --git a/src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp b/src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp index 285e26f98..9f01bbca2 100644 --- a/src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp +++ b/src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp @@ -161,5 +161,3 @@ QString PlayListOption::boolToText(bool enabled) { return QString(enabled ? "[+]" : "[-]"); } - -Q_EXPORT_PLUGIN2(playlistoption, PlayListOption) diff --git a/src/plugins/CommandLineOptions/PlayListOption/playlistoption.h b/src/plugins/CommandLineOptions/PlayListOption/playlistoption.h index 8e6f72a32..a255e095a 100644 --- a/src/plugins/CommandLineOptions/PlayListOption/playlistoption.h +++ b/src/plugins/CommandLineOptions/PlayListOption/playlistoption.h @@ -33,6 +33,7 @@ class PlayListOption : 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; diff --git a/src/plugins/CommandLineOptions/SeekOption/CMakeLists.txt b/src/plugins/CommandLineOptions/SeekOption/CMakeLists.txt index 468e1861a..5a660e326 100644 --- a/src/plugins/CommandLineOptions/SeekOption/CMakeLists.txt +++ b/src/plugins/CommandLineOptions/SeekOption/CMakeLists.txt @@ -1,20 +1,7 @@ project(seekoption) -# 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(seekoption_SRCS SET(seekoption_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(seekoption_RCC_SRCS ${seekoption_RCCS}) +QT5_ADD_RESOURCES(seekoption_RCC_SRCS ${seekoption_RCCS}) # Don't forget to include output directory, otherwise @@ -35,5 +22,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(seekoption MODULE ${seekoption_SRCS} ${seekoption_RCC_SRCS}) add_dependencies(seekoption qmmpui) -target_link_libraries(seekoption ${QT_LIBRARIES} qmmpui libqmmp) +target_link_libraries(seekoption Qt5::Widgets -lqmmpui -lqmmp) install(TARGETS seekoption DESTINATION ${LIB_DIR}/qmmp/CommandLineOptions) diff --git a/src/plugins/CommandLineOptions/SeekOption/seekoption.cpp b/src/plugins/CommandLineOptions/SeekOption/seekoption.cpp index 509f62392..02e971940 100644 --- a/src/plugins/CommandLineOptions/SeekOption/seekoption.cpp +++ b/src/plugins/CommandLineOptions/SeekOption/seekoption.cpp @@ -87,5 +87,3 @@ QTranslator *SeekOption::createTranslator(QObject *parent) translator->load(QString(":/seek_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(seekoption, SeekOption) diff --git a/src/plugins/CommandLineOptions/SeekOption/seekoption.h b/src/plugins/CommandLineOptions/SeekOption/seekoption.h index e19dae366..4310b1e53 100644 --- a/src/plugins/CommandLineOptions/SeekOption/seekoption.h +++ b/src/plugins/CommandLineOptions/SeekOption/seekoption.h @@ -31,6 +31,7 @@ class SeekOption : 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; 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; diff --git a/src/plugins/CommandLineOptions/UninstallOption/uninstalloption.cpp b/src/plugins/CommandLineOptions/UninstallOption/uninstalloption.cpp index d74aebd61..a4a096f1b 100644 --- a/src/plugins/CommandLineOptions/UninstallOption/uninstalloption.cpp +++ b/src/plugins/CommandLineOptions/UninstallOption/uninstalloption.cpp @@ -71,5 +71,3 @@ QTranslator *UninstallOption::createTranslator(QObject *parent) translator->load(QString(":/uninstall_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(uninstalloption, UninstallOption) diff --git a/src/plugins/CommandLineOptions/UninstallOption/uninstalloption.h b/src/plugins/CommandLineOptions/UninstallOption/uninstalloption.h index 9eba15f49..21eb302a2 100644 --- a/src/plugins/CommandLineOptions/UninstallOption/uninstalloption.h +++ b/src/plugins/CommandLineOptions/UninstallOption/uninstalloption.h @@ -33,6 +33,7 @@ class UninstallOption : 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; |