From 8453224119a4c5ff7d47d9cd4924d0b1ccb99b3a Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Sat, 25 Nov 2017 18:00:06 +0000
Subject: 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
---
 .../IncDecVolumeOption/CMakeLists.txt                   | 17 ++---------------
 .../IncDecVolumeOption/incdecvolumeoption.cpp           |  2 --
 .../IncDecVolumeOption/incdecvolumeoption.h             |  1 +
 3 files changed, 3 insertions(+), 17 deletions(-)

(limited to 'src/plugins/CommandLineOptions/IncDecVolumeOption')

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;
-- 
cgit v1.2.3-13-gbd6f