[Kst] branches/work/kst/portto4/kst

[Peter Kümmel]

SVN commit 1313579 by kuemmel:

FILE in Q_PLUGIN_METADATA is optional

 M  +0 -7      cmake/modules/KstMacros.cmake  
 M  +1 -1      src/datasources/ascii/asciiplugin.h  
 M  +1 -1      src/datasources/qimagesource/qimagesource.h  
 M  +1 -1      src/datasources/sampledatasource/sampledatasource.h  
 M  +1 -1      src/plugins/dataobject/bin/bin.h  
 M  +1 -1      src/plugins/dataobject/chop/chop.h  
 M  +1 -1      src/plugins/dataobject/crossspectrum/crossspectrum.h  
 M  +1 -1      src/plugins/dataobject/differentiation/differentiation.h  
 M  +1 -1      src/plugins/dataobject/effectivebandwidth/effectivebandwidth.h  
 M  +1 -1      src/plugins/dataobject/genericfilter/genericfilter.h  
 M  +1 -1      src/plugins/dataobject/linefit/linefit.h  
 M  +1 -1      src/plugins/dataobject/lockin/lockin.h  
 M  +1 -1      src/plugins/dataobject/phase/phase.h  
 M  +1 -1      src/plugins/dataobject/shift/shift.h  
 M  +1 -1      src/plugins/dataobject/statistics/statistics.h  
 M  +1 -1      src/plugins/dataobject/syncbin/syncbin.h  
 M  +1 -1      src/plugins/filters/cumulativesum/cumulativesum.h  
 M  +1 -1      src/plugins/filters/despike/filterdespike.h  
 M  +1 -1      src/plugins/filters/differentiation/differentiation.h  


--- branches/work/kst/portto4/kst/cmake/modules/KstMacros.cmake #1313578:1313579
@@ -171,13 +171,6 @@
 	if(kst_verbose)
 	  message(STATUS "Building plugin ${kst_name}")
 	endif()
-	if(kst_qt5)
-		set(keyfile ${kst_dir}/${kst_plugin_dir}/${folder}/${name}/pluginkey.json)
-		if(NOT EXISTS ${keyfile})
-			message(STATUS "Creating plugin key file ${keyfile}")
-			file(WRITE ${keyfile} "{ \"Keys\": [ \"key-is-not-evaluated\" ] }")
-		endif()
-	endif()
 endmacro()
 
 
--- branches/work/kst/portto4/kst/src/datasources/ascii/asciiplugin.h #1313578:1313579
@@ -30,7 +30,7 @@
     Q_OBJECT
     Q_INTERFACES(Kst::DataSourcePluginInterface)
 #ifdef QT5
-    Q_PLUGIN_METADATA(IID "com.kst.DataSourcePluginInterface/2.0" FILE "pluginkey.json")
+    Q_PLUGIN_METADATA(IID "com.kst.DataSourcePluginInterface/2.0")
 #endif
 
   public:
--- branches/work/kst/portto4/kst/src/datasources/qimagesource/qimagesource.h #1313578:1313579
@@ -59,7 +59,7 @@
     Q_OBJECT
     Q_INTERFACES(Kst::DataSourcePluginInterface)
 #ifdef QT5
-    Q_PLUGIN_METADATA(IID "com.kst.DataObjectPluginInterface/2.0" FILE "pluginkey.json")
+    Q_PLUGIN_METADATA(IID "com.kst.DataObjectPluginInterface/2.0")
 #endif
   public:
     virtual ~QImageSourcePlugin() {}
--- branches/work/kst/portto4/kst/src/datasources/sampledatasource/sampledatasource.h #1313578:1313579
@@ -47,7 +47,7 @@
     Q_OBJECT
     Q_INTERFACES(Kst::DataSourcePluginInterface)
 #ifdef QT5
-    Q_PLUGIN_METADATA(IID "com.kst.DataSourcePluginInterface/2.0" FILE "pluginkey.json")
+    Q_PLUGIN_METADATA(IID "com.kst.DataSourcePluginInterface/2.0")
 #endif
   public:
     virtual ~SampleDatasourcePlugin() {}
--- branches/work/kst/portto4/kst/src/plugins/dataobject/bin/bin.h #1313578:1313579
@@ -57,7 +57,7 @@
     Q_OBJECT
     Q_INTERFACES(Kst::DataObjectPluginInterface)
 #ifdef QT5
-    Q_PLUGIN_METADATA(IID "com.kst.DataObjectPluginInterface/2.0" FILE "pluginkey.json")
+    Q_PLUGIN_METADATA(IID "com.kst.DataObjectPluginInterface/2.0")
 #endif
 
   public:
--- branches/work/kst/portto4/kst/src/plugins/dataobject/chop/chop.h #1313578:1313579
@@ -56,7 +56,7 @@
     Q_OBJECT
     Q_INTERFACES(Kst::DataObjectPluginInterface)
 #ifdef QT5
-    Q_PLUGIN_METADATA(IID "com.kst.DataObjectPluginInterface/2.0" FILE "pluginkey.json")
+    Q_PLUGIN_METADATA(IID "com.kst.DataObjectPluginInterface/2.0")
 #endif
   public:
     virtual ~ChopPlugin() {}
--- branches/work/kst/portto4/kst/src/plugins/dataobject/crossspectrum/crossspectrum.h #1313578:1313579
@@ -59,7 +59,7 @@
     Q_OBJECT
     Q_INTERFACES(Kst::DataObjectPluginInterface)
 #ifdef QT5
-    Q_PLUGIN_METADATA(IID "com.kst.DataObjectPluginInterface/2.0" FILE "pluginkey.json")
+    Q_PLUGIN_METADATA(IID "com.kst.DataObjectPluginInterface/2.0")
 #endif
   public:
     virtual ~CrossSpectrumPlugin() {}
--- branches/work/kst/portto4/kst/src/plugins/dataobject/differentiation/differentiation.h #1313578:1313579
@@ -55,7 +55,7 @@
     Q_OBJECT
     Q_INTERFACES(Kst::DataObjectPluginInterface)
 #ifdef QT5
-    Q_PLUGIN_METADATA(IID "com.kst.DataObjectPluginInterface/2.0" FILE "pluginkey.json")
+    Q_PLUGIN_METADATA(IID "com.kst.DataObjectPluginInterface/2.0")
 #endif
   public:
     virtual ~DifferentiationPlugin() {}
--- branches/work/kst/portto4/kst/src/plugins/dataobject/effectivebandwidth/effectivebandwidth.h #1313578:1313579
@@ -60,7 +60,7 @@
     Q_OBJECT
     Q_INTERFACES(Kst::DataObjectPluginInterface)
 #ifdef QT5
-    Q_PLUGIN_METADATA(IID "com.kst.DataObjectPluginInterface/2.0" FILE "pluginkey.json")
+    Q_PLUGIN_METADATA(IID "com.kst.DataObjectPluginInterface/2.0")
 #endif
   public:
     virtual ~EffectiveBandwidthPlugin() {}
--- branches/work/kst/portto4/kst/src/plugins/dataobject/genericfilter/genericfilter.h #1313578:1313579
@@ -57,7 +57,7 @@
     Q_OBJECT
     Q_INTERFACES(Kst::DataObjectPluginInterface)
 #ifdef QT5
-    Q_PLUGIN_METADATA(IID "com.kst.DataObjectPluginInterface/2.0" FILE "pluginkey.json")
+    Q_PLUGIN_METADATA(IID "com.kst.DataObjectPluginInterface/2.0")
 #endif
   public:
     virtual ~GenericFilterPlugin() {}
--- branches/work/kst/portto4/kst/src/plugins/dataobject/linefit/linefit.h #1313578:1313579
@@ -57,7 +57,7 @@
     Q_OBJECT
     Q_INTERFACES(Kst::DataObjectPluginInterface)
 #ifdef QT5
-    Q_PLUGIN_METADATA(IID "com.kst.DataObjectPluginInterface/2.0" FILE "pluginkey.json")
+    Q_PLUGIN_METADATA(IID "com.kst.DataObjectPluginInterface/2.0")
 #endif
   public:
     virtual ~LineFitPlugin() {}
--- branches/work/kst/portto4/kst/src/plugins/dataobject/lockin/lockin.h #1313578:1313579
@@ -55,7 +55,7 @@
     Q_OBJECT
     Q_INTERFACES(Kst::DataObjectPluginInterface)
 #ifdef QT5
-    Q_PLUGIN_METADATA(IID "com.kst.DataObjectPluginInterface/2.0" FILE "pluginkey.json")
+    Q_PLUGIN_METADATA(IID "com.kst.DataObjectPluginInterface/2.0")
 #endif
   public:
     virtual ~LockInPlugin() {}
--- branches/work/kst/portto4/kst/src/plugins/dataobject/phase/phase.h #1313578:1313579
@@ -63,7 +63,7 @@
     Q_OBJECT
     Q_INTERFACES(Kst::DataObjectPluginInterface)
 #ifdef QT5
-    Q_PLUGIN_METADATA(IID "com.kst.DataObjectPluginInterface/2.0" FILE "pluginkey.json")
+    Q_PLUGIN_METADATA(IID "com.kst.DataObjectPluginInterface/2.0")
 #endif
   public:
     virtual ~PhasePlugin() {}
--- branches/work/kst/portto4/kst/src/plugins/dataobject/shift/shift.h #1313578:1313579
@@ -57,7 +57,7 @@
     Q_OBJECT
     Q_INTERFACES(Kst::DataObjectPluginInterface)
 #ifdef QT5
-    Q_PLUGIN_METADATA(IID "com.kst.DataObjectPluginInterface/2.0" FILE "pluginkey.json")
+    Q_PLUGIN_METADATA(IID "com.kst.DataObjectPluginInterface/2.0")
 #endif
   public:
     virtual ~ShiftPlugin() {}
--- branches/work/kst/portto4/kst/src/plugins/dataobject/statistics/statistics.h #1313578:1313579
@@ -60,7 +60,7 @@
     Q_OBJECT
     Q_INTERFACES(Kst::DataObjectPluginInterface)
 #ifdef QT5
-    Q_PLUGIN_METADATA(IID "com.kst.DataObjectPluginInterface/2.0" FILE "pluginkey.json")
+    Q_PLUGIN_METADATA(IID "com.kst.DataObjectPluginInterface/2.0")
 #endif
   public:
     virtual ~StatisticsPlugin() {}
--- branches/work/kst/portto4/kst/src/plugins/dataobject/syncbin/syncbin.h #1313578:1313579
@@ -60,7 +60,7 @@
     Q_OBJECT
     Q_INTERFACES(Kst::DataObjectPluginInterface)
 #ifdef QT5
-    Q_PLUGIN_METADATA(IID "com.kst.DataObjectPluginInterface/2.0" FILE "pluginkey.json")
+    Q_PLUGIN_METADATA(IID "com.kst.DataObjectPluginInterface/2.0")
 #endif
   public:
     virtual ~SyncBinPlugin() {}
--- branches/work/kst/portto4/kst/src/plugins/filters/cumulativesum/cumulativesum.h #1313578:1313579
@@ -59,7 +59,7 @@
     Q_OBJECT
     Q_INTERFACES(Kst::DataObjectPluginInterface)
 #ifdef QT5
-    Q_PLUGIN_METADATA(IID "com.kst.DataObjectPluginInterface/2.0" FILE "pluginkey.json")
+    Q_PLUGIN_METADATA(IID "com.kst.DataObjectPluginInterface/2.0")
 #endif
   public:
     virtual ~CumulativeSumPlugin() {}
--- branches/work/kst/portto4/kst/src/plugins/filters/despike/filterdespike.h #1313578:1313579
@@ -60,7 +60,7 @@
     Q_OBJECT
     Q_INTERFACES(Kst::DataObjectPluginInterface)
 #ifdef QT5
-    Q_PLUGIN_METADATA(IID "com.kst.DataObjectPluginInterface/2.0" FILE "pluginkey.json")
+    Q_PLUGIN_METADATA(IID "com.kst.DataObjectPluginInterface/2.0")
 #endif
   public:
     virtual ~FilterDespikePlugin() {}
--- branches/work/kst/portto4/kst/src/plugins/filters/differentiation/differentiation.h #1313578:1313579
@@ -59,7 +59,7 @@
     Q_OBJECT
     Q_INTERFACES(Kst::DataObjectPluginInterface)
 #ifdef QT5
-    Q_PLUGIN_METADATA(IID "com.kst.DataObjectPluginInterface/2.0" FILE "pluginkey.json")
+    Q_PLUGIN_METADATA(IID "com.kst.DataObjectPluginInterface/2.0")
 #endif
   public:
     virtual ~DifferentiationPlugin() {}