Merge branch 'master' into 'master'

[nemo-qml-plugin-filemanager] Avoid double deletion of FileEngine. Fixes JB#34723

QtQuick owns the instance given to qmlRegisterSingletonType().

@jpetrell 

See merge request !5

src/fileengine.cpp

@@ -40,16 +40,13 @@
 #include <QTextStream>
 #include <unistd.h>
 
-Q_GLOBAL_STATIC(FileEngine, engine);
-
 
 FileEngine::FileEngine(QObject *parent) :
     QObject(parent),
     m_clipboardContainsCopy(false)
 {
     m_fileWorker = new FileWorker(this);
 
-
     // pass worker end signals to QML
     connect(m_fileWorker, &FileWorker::done, this, &FileEngine::workerDone);
     connect(m_fileWorker, &FileWorker::cancelled, this, &FileEngine::cancelled);
@@ -69,11 +66,6 @@ FileEngine::~FileEngine()
     m_fileWorker->wait();   // wait until thread stops
 }
 
-FileEngine *FileEngine::instance()
-{
-    return engine();
-}
-
 FileEngine::Mode FileEngine::mode() const
 {
     return m_fileWorker->mode();

src/fileengine.h

@@ -81,9 +81,6 @@ class FileEngine : public QObject
     bool busy() const;
     Mode mode() const;
 
-    // For C++
-    static FileEngine *instance();
-
     // methods accessible from QML
 
     // asynch methods send signals when done or error occurs

src/plugin.cpp

@@ -41,7 +41,7 @@
 
 static QObject *engine_api_factory(QQmlEngine *, QJSEngine *)
 {
-    return FileEngine::instance();
+    return new FileEngine;
 }
 
 class Q_DECL_EXPORT NemoFileManagerPlugin : public QQmlExtensionPlugin