18 files changed, 51 insertions, 176 deletions
diff --git a/src/plugins/General/converter/converter.pro b/src/plugins/General/converter/converter.pro
index 938601bb7..de458d4eb 100644
--- a/src/plugins/General/converter/converter.pro
+++ b/src/plugins/General/converter/converter.pro
@@ -1,20 +1,13 @@
 include(../../plugins.pri)
 
-CONFIG += warn_on \
-plugin \
-link_pkgconfig
 
 TARGET =$$PLUGINS_PREFIX/General/converter
 unix:QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libconverter.so
 
-
-TEMPLATE = lib
-unix:LIBS += -lqmmpui -lqmmp
+LIBS += -lqmmpui
 
 PKGCONFIG += taglib
 
-win32:LIBS += -lqmmpui0 -lqmmp0
-
 RESOURCES = translations/translations.qrc presets.qrc
 
 unix{
@@ -26,7 +19,7 @@ HEADERS += converterfactory.h \
     converterdialog.h \
     converter.h \
     preseteditor.h
-win32:HEADERS += ../../../../src/qmmpui/general.h
+
 SOURCES += converterfactory.cpp \
     converterhelper.cpp \
     converterdialog.cpp \
diff --git a/src/plugins/General/copypaste/copypaste.pro b/src/plugins/General/copypaste/copypaste.pro
index 6610a4f2f..dba9e5b39 100644
--- a/src/plugins/General/copypaste/copypaste.pro
+++ b/src/plugins/General/copypaste/copypaste.pro
@@ -1,16 +1,9 @@
 include(../../plugins.pri)
 
-CONFIG += warn_on \
-plugin
-
 TARGET =$$PLUGINS_PREFIX/General/copypaste
 unix : QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libcopypaste.so
 
-
-TEMPLATE = lib
-unix:LIBS += -lqmmpui -lqmmp
-
-win32:LIBS += -lqmmpui0 -lqmmp0
+LIBS += -lqmmpui
 
 RESOURCES = translations/translations.qrc
 unix {
@@ -20,7 +13,6 @@ unix {
 HEADERS += copypastefactory.h \
            copypaste.h
 
-win32 : HEADERS += ../../../../src/qmmpui/general.h
 SOURCES += copypastefactory.cpp \
            copypaste.cpp
 
diff --git a/src/plugins/General/covermanager/covermanager.pro b/src/plugins/General/covermanager/covermanager.pro
index 311798b3b..c74960bfd 100644
--- a/src/plugins/General/covermanager/covermanager.pro
+++ b/src/plugins/General/covermanager/covermanager.pro
@@ -1,24 +1,8 @@
 include(../../plugins.pri)
-CONFIG += warn_on \
-    plugin
-TEMPLATE = lib
+
 TARGET = $$PLUGINS_PREFIX/General/covermanager
 unix:QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libcovermanager.so
-TRANSLATIONS = translations/covermanager_plugin_cs.ts \
-    translations/covermanager_plugin_de.ts \
-    translations/covermanager_plugin_zh_CN.ts \
-    translations/covermanager_plugin_zh_TW.ts \
-    translations/covermanager_plugin_ru.ts \
-    translations/covermanager_plugin_pl.ts \
-    translations/covermanager_plugin_uk_UA.ts \
-    translations/covermanager_plugin_it.ts \
-    translations/covermanager_plugin_tr.ts \
-    translations/covermanager_plugin_lt.ts \
-    translations/covermanager_plugin_nl.ts \
-    translations/covermanager_plugin_ja.ts \
-    translations/covermanager_plugin_es.ts \
-    translations/covermanager_plugin_sr_BA.ts \
-    translations/covermanager_plugin_sr_RS.ts
+
 
 RESOURCES = translations/translations.qrc \
             images/cm_images.qrc
@@ -29,13 +13,10 @@ unix {
 HEADERS += covermanagerfactory.h \
     coverwidget.h \
     covermanager.h
-win32:HEADERS += ../../../../src/qmmpui/general.h
+
 SOURCES += covermanagerfactory.cpp \
     coverwidget.cpp \
     covermanager.cpp
-QT += network
 
-unix:LIBS += -lqmmpui \
-    -lqmmp
-win32:LIBS += -lqmmpui0 \
-    -lqmmp0
+QT += network
+LIBS += -lqmmpui
diff --git a/src/plugins/General/fileops/fileops.pro b/src/plugins/General/fileops/fileops.pro
index e132670f9..79b5cf895 100644
--- a/src/plugins/General/fileops/fileops.pro
+++ b/src/plugins/General/fileops/fileops.pro
@@ -1,16 +1,9 @@
 include(../../plugins.pri)
 
-CONFIG += warn_on \
-plugin
-
 TARGET =$$PLUGINS_PREFIX/General/fileops
 unix : QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libfileops.so
 
-
-TEMPLATE = lib
-unix : LIBS += -lqmmpui -lqmmp
-
-win32 : LIBS += -lqmmpui0 -lqmmp0
+LIBS += -lqmmpui
 
 RESOURCES = translations/translations.qrc
 unix {
@@ -21,7 +14,7 @@ HEADERS += fileopsfactory.h \
            fileops.h \
            settingsdialog.h \
            hotkeydialog.h
-win32 : HEADERS += ../../../../src/qmmpui/general.h
+
 SOURCES += fileopsfactory.cpp \
            fileops.cpp \
            settingsdialog.cpp \
diff --git a/src/plugins/General/gnomehotkey/gnomehotkey.pro b/src/plugins/General/gnomehotkey/gnomehotkey.pro
index 429c92848..0968f35ed 100644
--- a/src/plugins/General/gnomehotkey/gnomehotkey.pro
+++ b/src/plugins/General/gnomehotkey/gnomehotkey.pro
@@ -1,15 +1,10 @@
 include(../../plugins.pri)
 
-CONFIG += warn_on \
-plugin  \
- lib \
- qdbus
+QT += dbus
 
 TARGET = $$PLUGINS_PREFIX/General/gnomehotkey
 QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libgnomehotkey.so
 
-TEMPLATE = lib
-
 RESOURCES = translations/translations.qrc
 
 target.path = $$LIB_DIR/qmmp/General
@@ -22,4 +17,4 @@ HEADERS += gnomehotkeyfactory.h \
 SOURCES += gnomehotkeyfactory.cpp \
     mediakeys.cpp
 
-LIBS += -lqmmpui -lqmmp
+LIBS += -lqmmpui
diff --git a/src/plugins/General/hal/hal.pro b/src/plugins/General/hal/hal.pro
index 083042183..22b577958 100644
--- a/src/plugins/General/hal/hal.pro
+++ b/src/plugins/General/hal/hal.pro
@@ -1,15 +1,10 @@
 include(../../plugins.pri)
 
-CONFIG += warn_on \
-plugin  \
- lib \
- qdbus
+QT += dbus
 
 TARGET = $$PLUGINS_PREFIX/General/hal
 QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libhal.so
 
-TEMPLATE = lib
-
 RESOURCES = translations/translations.qrc
 
 target.path = $$LIB_DIR/qmmp/General
@@ -28,6 +23,6 @@ SOURCES += halfactory.cpp \
            haldevice.cpp \
            settingsdialog.cpp
 
-LIBS += -lqmmpui -lqmmp
+LIBS += -lqmmpui
 
 FORMS += settingsdialog.ui
diff --git a/src/plugins/General/hotkey/hotkey.pro b/src/plugins/General/hotkey/hotkey.pro
index 438c981e6..a97191bcd 100644
--- a/src/plugins/General/hotkey/hotkey.pro
+++ b/src/plugins/General/hotkey/hotkey.pro
@@ -1,16 +1,7 @@
 include(../../plugins.pri)
 
-CONFIG += warn_on \
-plugin  \
- lib  \
- link_pkgconfig
-
-
 TARGET = $$PLUGINS_PREFIX/General/hotkey
 
-
-TEMPLATE = lib
-
 RESOURCES = translations/translations.qrc
 
 target.path = $$LIB_DIR/qmmp/General
@@ -35,9 +26,8 @@ unix {
     QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libhotkey.so
     PKGCONFIG += x11
     DEFINES += HAVE_XKBLIB_H
-    LIBS += -lqmmpui -lqmmp
 }
 
-win32 {
-    LIBS += -lqmmpui0 -lqmmp0
-}
+
+LIBS += -lqmmpui
+
diff --git a/src/plugins/General/kdenotify/kdenotify.pro b/src/plugins/General/kdenotify/kdenotify.pro
index 7de78438b..75b7f11d2 100644
--- a/src/plugins/General/kdenotify/kdenotify.pro
+++ b/src/plugins/General/kdenotify/kdenotify.pro
@@ -3,15 +3,11 @@
 # -------------------------------------------------
 include(../../plugins.pri)
 QT += dbus
-CONFIG += warn_on \
-    plugin
-unix:TARGET = $$PLUGINS_PREFIX/General/kdenotify
-unix:QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libkdenotify.so
-TEMPLATE = lib
-unix {
-    LIBS += -lqmmpui \
-        -lqmmp
-}
+
+TARGET = $$PLUGINS_PREFIX/General/kdenotify
+QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libkdenotify.so
+LIBS += -lqmmpui
+
 unix {
     target.path = $$LIB_DIR/qmmp/General
     INSTALLS += target
diff --git a/src/plugins/General/lyrics/lyrics.pro b/src/plugins/General/lyrics/lyrics.pro
index 88336bd95..d4007b6de 100644
--- a/src/plugins/General/lyrics/lyrics.pro
+++ b/src/plugins/General/lyrics/lyrics.pro
@@ -1,16 +1,9 @@
 include(../../plugins.pri)
 
-CONFIG += warn_on \
-plugin
-
 TARGET =$$PLUGINS_PREFIX/General/lyrics
 unix:QMAKE_CLEAN = $$PLUGINS_PREFIX/General/liblyrics.so
 
-
-TEMPLATE = lib
-unix:LIBS += -lqmmpui -lqmmp
-
-win32:LIBS += -lqmmpui0 -lqmmp0
+LIBS += -lqmmpui
 
 RESOURCES = translations/translations.qrc
 
diff --git a/src/plugins/General/mpris/mpris.pro b/src/plugins/General/mpris/mpris.pro
index 934d2fbb5..5a1518440 100644
--- a/src/plugins/General/mpris/mpris.pro
+++ b/src/plugins/General/mpris/mpris.pro
@@ -1,15 +1,10 @@
 include(../../plugins.pri)
 
-CONFIG += warn_on \
-plugin  \
- lib \
- qdbus
+QT += dbus
 
 TARGET =$$PLUGINS_PREFIX/General/mpris
 QMAKE_CLEAN =$$PLUGINS_PREFIX/General/libmpris.so
 
-TEMPLATE = lib
-
 RESOURCES = translations/translations.qrc
 
 target.path = $$LIB_DIR/qmmp/General
@@ -31,4 +26,4 @@ SOURCES += mprisfactory.cpp \
            mpris2/root2object.cpp \
            mpris2/player2object.cpp
 
-LIBS += -lqmmpui -lqmmp
+LIBS += -lqmmpui
diff --git a/src/plugins/General/notifier/notifier.pro b/src/plugins/General/notifier/notifier.pro
index 5e33b5fd3..5380030f9 100644
--- a/src/plugins/General/notifier/notifier.pro
+++ b/src/plugins/General/notifier/notifier.pro
@@ -1,21 +1,15 @@
 include(../../plugins.pri)
 
-CONFIG += warn_on \
-plugin
 
 TARGET =$$PLUGINS_PREFIX/General/notifier
 unix:QMAKE_CLEAN =$$PLUGINS_PREFIX/General/libnotifier.so
 
-
-TEMPLATE = lib
-unix:LIBS += -lqmmpui -lqmmp
-win32:LIBS += -lqmmpui0 -lqmmp0
+LIBS += -lqmmpui
 
 RESOURCES = notifier_images.qrc \
             translations/translations.qrc
 
 unix {
-  CONFIG += link_pkgconfig
   PKGCONFIG += x11
   target.path = $$LIB_DIR/qmmp/General
   INSTALLS += target
diff --git a/src/plugins/General/rgscan/rgscan.pro b/src/plugins/General/rgscan/rgscan.pro
index fd8656de2..dc26945b2 100644
--- a/src/plugins/General/rgscan/rgscan.pro
+++ b/src/plugins/General/rgscan/rgscan.pro
@@ -1,23 +1,15 @@
 include(../../plugins.pri)
 
-CONFIG += warn_on \
-plugin \
-link_pkgconfig
-
 TARGET =$$PLUGINS_PREFIX/General/rgscan
 unix:QMAKE_CLEAN = $$PLUGINS_PREFIX/General/librgscan.so
 
-
-TEMPLATE = lib
-unix:LIBS += -lqmmpui -lqmmp
-
-win32:LIBS += -lqmmpui0 -lqmmp0 -ltag.dll
+LIBS += -lqmmpui
 
 RESOURCES = translations/translations.qrc
 unix{
-PKGCONFIG += taglib
-target.path = $$LIB_DIR/qmmp/General
-INSTALLS += target
+  PKGCONFIG += taglib
+  target.path = $$LIB_DIR/qmmp/General
+  INSTALLS += target
 }
 HEADERS += rgscanfactory.h \
     rgscanhelper.h \
@@ -25,7 +17,6 @@ HEADERS += rgscanfactory.h \
     gain_analysis.h \
     rgscanner.h
 
-win32:HEADERS += ../../../../src/qmmpui/general.h
 SOURCES += rgscanfactory.cpp \
     rgscanhelper.cpp \
     rgscandialog.cpp \
diff --git a/src/plugins/General/scrobbler/scrobbler.pro b/src/plugins/General/scrobbler/scrobbler.pro
index 16931c7a1..bab0e0a82 100644
--- a/src/plugins/General/scrobbler/scrobbler.pro
+++ b/src/plugins/General/scrobbler/scrobbler.pro
@@ -1,7 +1,5 @@
 include(../../plugins.pri)
-CONFIG += warn_on \
-    plugin
-TEMPLATE = lib
+
 TARGET = $$PLUGINS_PREFIX/General/scrobbler
 unix:QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libscrobbler.so
 
@@ -16,19 +14,20 @@ HEADERS += scrobblerfactory.h \
     scrobblercache.h \
     scrobbler.h \
     defines.h
-win32:HEADERS += ../../../../src/qmmpui/general.h
+
 SOURCES += scrobblerfactory.cpp \
     settingsdialog.cpp \
     scrobblerhandler.cpp \
     scrobblercache.cpp \
     scrobbler.cpp
-QT += network
-unix:LIBS += -lqmmpui \
-    -lqmmp
-win32:LIBS += -lqmmpui0 \
-    -lqmmp0
+
 FORMS += settingsdialog.ui
 
+QT += network
+
+LIBS += -lqmmpui
+
+
 
 
 
diff --git a/src/plugins/General/statusicon/statusicon.pro b/src/plugins/General/statusicon/statusicon.pro
index 4228d60f6..49e9c8d83 100644
--- a/src/plugins/General/statusicon/statusicon.pro
+++ b/src/plugins/General/statusicon/statusicon.pro
@@ -1,18 +1,10 @@
 include(../../plugins.pri)
-CONFIG += warn_on \
-    plugin
+
 unix:TARGET = $$PLUGINS_PREFIX/General/statusicon
 unix:QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libstatusicon.so
 win32:TARGET = $$PLUGINS_PREFIX/General/statusicon
-TEMPLATE = lib
-unix {
-    LIBS += -lqmmpui \
-        -lqmmp
-}
-win32 {
-    LIBS += -lqmmpui0 \
-        -lqmmp0
-}
+
+LIBS += -lqmmpui
 
 RESOURCES = translations/translations.qrc
 unix {
@@ -32,5 +24,6 @@ SOURCES += statusiconfactory.cpp \
     qmmptrayicon.cpp \
     statusiconpopupwidget.cpp \
     coverwidget.cpp
+
 FORMS += settingsdialog.ui
-win32:HEADERS += ../../../../src/qmmpui/general.h
+
diff --git a/src/plugins/General/streambrowser/streambrowser.pro b/src/plugins/General/streambrowser/streambrowser.pro
index 1bf1235de..049db03a8 100644
--- a/src/plugins/General/streambrowser/streambrowser.pro
+++ b/src/plugins/General/streambrowser/streambrowser.pro
@@ -1,22 +1,15 @@
 include(../../plugins.pri)
 
-CONFIG += warn_on \
-plugin
-
 TARGET =$$PLUGINS_PREFIX/General/streambrowser
 unix:QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libstreambrowser.so
 
-
-TEMPLATE = lib
-unix:LIBS += -lqmmpui -lqmmp
-
-win32:LIBS += -lqmmpui0 -lqmmp0
+LIBS += -lqmmpui
 
 RESOURCES = translations/translations.qrc
 
 unix {
-target.path = $$LIB_DIR/qmmp/General
-INSTALLS += target
+  target.path = $$LIB_DIR/qmmp/General
+  INSTALLS += target
 }
 HEADERS += streambrowserfactory.h \
            streambrowser.h \
diff --git a/src/plugins/General/trackchange/trackchange.pro b/src/plugins/General/trackchange/trackchange.pro
index f5b0264e1..cc76d713b 100644
--- a/src/plugins/General/trackchange/trackchange.pro
+++ b/src/plugins/General/trackchange/trackchange.pro
@@ -1,16 +1,9 @@
 include(../../plugins.pri)
 
-CONFIG += warn_on \
-plugin
-
 TARGET =$$PLUGINS_PREFIX/General/trackchange
 unix : QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libtrackchange.so
 
-
-TEMPLATE = lib
-unix : LIBS += -lqmmpui -lqmmp
-
-win32 : LIBS += -lqmmpui0 -lqmmp0
+LIBS += -lqmmpui
 
 RESOURCES = translations/translations.qrc
 unix {
@@ -21,7 +14,6 @@ HEADERS += trackchangefactory.h \
            trackchange.h \
            settingsdialog.h
 
-win32 : HEADERS += ../../../../src/qmmpui/general.h
 SOURCES += trackchangefactory.cpp \
            trackchange.cpp \
            settingsdialog.cpp
diff --git a/src/plugins/General/udisks/udisks.pro b/src/plugins/General/udisks/udisks.pro
index b3f1c8d41..388926ff0 100644
--- a/src/plugins/General/udisks/udisks.pro
+++ b/src/plugins/General/udisks/udisks.pro
@@ -1,15 +1,10 @@
 include(../../plugins.pri)
 
-CONFIG += warn_on \
-plugin  \
- lib \
- qdbus
+QT += dbus
 
 TARGET = $$PLUGINS_PREFIX/General/udisks
 QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libudisks.so
 
-TEMPLATE = lib
-
 RESOURCES = translations/translations.qrc
 
 target.path = $$LIB_DIR/qmmp/General
@@ -28,6 +23,6 @@ SOURCES += udisksfactory.cpp \
            udisksdevice.cpp \
            settingsdialog.cpp
 
-LIBS += -lqmmpui -lqmmp
+LIBS += -lqmmpui
 
 FORMS += settingsdialog.ui
diff --git a/src/plugins/General/udisks2/udisks2.pro b/src/plugins/General/udisks2/udisks2.pro
index 484229668..193af114f 100644
--- a/src/plugins/General/udisks2/udisks2.pro
+++ b/src/plugins/General/udisks2/udisks2.pro
@@ -1,15 +1,10 @@
 include(../../plugins.pri)
 
-CONFIG += warn_on \
-plugin  \
- lib \
- qdbus
+QT += dbus
 
 TARGET = $$PLUGINS_PREFIX/General/udisks2
 QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libudisks2.so
 
-TEMPLATE = lib
-
 RESOURCES = translations/translations.qrc
 
 target.path = $$LIB_DIR/qmmp/General
@@ -28,6 +23,6 @@ SOURCES += udisks2factory.cpp \
            udisks2device.cpp \
            settingsdialog.cpp
 
-LIBS += -lqmmpui -lqmmp
+LIBS += -lqmmpui
 
 FORMS += settingsdialog.ui