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

3 files changed, 4 insertions, 18 deletions

diff --git a/src/plugins/PlayListFormats/m3u/CMakeLists.txt b/src/plugins/PlayListFormats/m3u/CMakeLists.txt
index a96c2df62..d3e7b577d 100644
--- a/src/plugins/PlayListFormats/m3u/CMakeLists.txt
+++ b/src/plugins/PlayListFormats/m3u/CMakeLists.txt
@@ -1,20 +1,7 @@
 project(libm3uplaylistformat)
 
-# 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)
@@ -23,7 +10,7 @@ SET(libm3uplaylistformat_SRCS
     m3uplaylistformat.cpp
 )
 
-QT4_ADD_RESOURCES(libm3uplaylistformat_RCC_SRCS ${libm3uplaylistformat_RCCS})
+QT5_ADD_RESOURCES(libm3uplaylistformat_RCC_SRCS ${libm3uplaylistformat_RCCS})
 
 # Don't forget to include output directory, otherwise
 # the UI file won't be wrapped!
@@ -31,5 +18,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 ADD_LIBRARY(m3uplaylistformat MODULE ${libm3uplaylistformat_SRCS})
 add_dependencies(m3uplaylistformat qmmpui)
-target_link_libraries(m3uplaylistformat ${QT_LIBRARIES} qmmpui)
+target_link_libraries(m3uplaylistformat Qt5::Widgets -lqmmpui)
 install(TARGETS m3uplaylistformat DESTINATION ${LIB_DIR}/qmmp/PlayListFormats)
diff --git a/src/plugins/PlayListFormats/m3u/m3uplaylistformat.cpp b/src/plugins/PlayListFormats/m3u/m3uplaylistformat.cpp
index dd2ee0cd5..feb31fa19 100644
--- a/src/plugins/PlayListFormats/m3u/m3uplaylistformat.cpp
+++ b/src/plugins/PlayListFormats/m3u/m3uplaylistformat.cpp
@@ -35,7 +35,7 @@ const PlayListFormatProperties M3UPlaylistFormat::properties() const
 QList<PlayListTrack *> M3UPlaylistFormat::decode(const QByteArray &contents)
 {
     QList<PlayListTrack*> out;
-    QStringList splitted = QString::fromUtf8(contents.constData()).split("\n");
+    QStringList splitted = QString::fromUtf8(contents).split("\n");
     if(splitted.isEmpty())
         return out;
 
@@ -100,5 +100,3 @@ QByteArray M3UPlaylistFormat::encode(const QList<PlayListTrack*> &contents, cons
     }
     return out.join("\n").toUtf8();
 }
-
-Q_EXPORT_PLUGIN2(m3uplaylistformat,M3UPlaylistFormat)
diff --git a/src/plugins/PlayListFormats/m3u/m3uplaylistformat.h b/src/plugins/PlayListFormats/m3u/m3uplaylistformat.h
index d1188d553..c22bab1c8 100644
--- a/src/plugins/PlayListFormats/m3u/m3uplaylistformat.h
+++ b/src/plugins/PlayListFormats/m3u/m3uplaylistformat.h
@@ -33,6 +33,7 @@
 class M3UPlaylistFormat : public QObject, public PlayListFormat
 {
     Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.PlayListFormatInterface.1.0")
     Q_INTERFACES(PlayListFormat)
 public:
     const PlayListFormatProperties properties() const;