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

2 files changed, 1 insertions, 2 deletions

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;