Delete plugin.cpp

more
jasp-stats · Feb 4, 2025 · 4eaba42 · 4eaba42
1 parent 7095c82
commit 4eaba42
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 67 deletions.
diff --git a/Desktop/mainwindow.cpp b/Desktop/mainwindow.cpp
@@ -67,10 +67,6 @@
 #include <boost/iostreams/device/null.hpp>
 
 #include "communitydefs.h"
-#include <QtPlugin>
-
-//The following seemed to be necessary for loading the plugin on Windows (making it static so it links properly)
-Q_IMPORT_PLUGIN(JASPQmlPlugin)
 
 using namespace std;
 using namespace Modules;

diff --git a/QMLComponents/CMakeLists.txt b/QMLComponents/CMakeLists.txt
@@ -12,14 +12,12 @@ qt_add_qml_module(
 	URI						JASP.Controls
 	OUTPUT_DIRECTORY		"JASP/Controls"
 	RESOURCE_PREFIX			/jasp-stats.org/imports
-	#PLUGIN_TARGET			QMLComponentsPlugin
 	DEPENDENCIES			QtQuick
-	#NO_PLUGIN_OPTIONAL
-	#NO_GENERATE_PLUGIN_SOURCE
-	#CLASS_NAME				JASPQmlPlugin
 	SOURCES					${SOURCE_FILES} ${HEADER_FILES}
 	QML_FILES				${QML_FILES}
 )
+
+# This define is needed for the linking
 target_compile_definitions(QMLComponents PUBLIC QT_STATICPLUGIN)
 
 if(LINUX)

diff --git a/QMLComponents/plugin.cpp b/QMLComponents/plugin.cpp