Use jaspQMLControlsPlugin & jaspCommonLib

jasp-stats · boutinb · Mar 1, 2024 · Mar 1, 2024 · Mar 4, 2024 · Mar 4, 2024
commit 3786a9b69ba1f5619406dc05a3e564ce50c35845
diff --git a/.gitmodules b/.gitmodules
@@ -142,3 +142,9 @@
 [submodule "Modules/jaspSurvival"]
 	path = Modules/jaspSurvival
 	url = https://github.com/jasp-stats/jaspSurvival
+[submodule "jaspCommonLib"]
+	path = jaspCommonLib
+	url = https://github.com/jasp-stats/jaspCommonLib
+[submodule "jaspQMLControlsPlugin"]
+	path = jaspQMLControlsPlugin
+	url = https://github.com/jasp-stats/jaspQMLControlsPlugin
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -123,9 +123,9 @@ if(WIN32)
   set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
 endif()
 
-add_subdirectory(Common)
+add_subdirectory(jaspCommonLib)
 add_subdirectory(CommonData)
-add_subdirectory(QMLComponents)
+add_subdirectory(jaspQMLControlsPlugin)
 
 if(NOT WIN32)
   add_subdirectory(R-Interface)

diff --git a/Common/CMakeLists.txt b/Common/CMakeLists.txt
diff --git a/Common/appinfo.cpp.in b/Common/appinfo.cpp.in
diff --git a/Common/appinfo.h b/Common/appinfo.h