diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2017-11-25 18:00:06 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2017-11-25 18:00:06 +0000 |
| commit | 8453224119a4c5ff7d47d9cd4924d0b1ccb99b3a (patch) | |
| tree | 15d339b62e98d5858a57aa787334e14f0e2f0ad7 /src/plugins/CommandLineOptions/PlayListOption | |
| parent | 6fc05db7c6de9a51beba754f12ff4ac32859977d (diff) | |
| download | qmmp-8453224119a4c5ff7d47d9cd4924d0b1ccb99b3a.tar.gz qmmp-8453224119a4c5ff7d47d9cd4924d0b1ccb99b3a.tar.bz2 qmmp-8453224119a4c5ff7d47d9cd4924d0b1ccb99b3a.zip | |
copy 1.2 branch to trunk
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@7772 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/CommandLineOptions/PlayListOption')
3 files changed, 3 insertions, 17 deletions
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; |