Merge pull request #8629 from AWilco/patch-1

Correctly set parent of QGCCorePlugin

src/QGCToolbox.cc

@@ -134,13 +134,13 @@ void QGCToolbox::_scanAndLoadPlugins(QGCApplication* app)
 {
 #if defined (QGC_CUSTOM_BUILD)
     //-- Create custom plugin (Static)
-    _corePlugin = (QGCCorePlugin*) new CUSTOMCLASS(app, app->toolbox());
+    _corePlugin = (QGCCorePlugin*) new CUSTOMCLASS(app, this);
     if(_corePlugin) {
         return;
     }
 #endif
     //-- No plugins found, use default instance
-    _corePlugin = new QGCCorePlugin(app, app->toolbox());
+    _corePlugin = new QGCCorePlugin(app, this);
 }
 
 QGCTool::QGCTool(QGCApplication* app, QGCToolbox* toolbox)