Use jaspQMLControlsLib & jaspCommonLib

.gitignore

@@ -79,5 +79,3 @@ R.framework/
 Modules/renv-root/
 Desktop/utilities/simplecryptkey.h
 Desktop/modules/activemodules.h
-Common/appinfo.cpp
-QMLComponents/utilities/appdirs.h

.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

CMakeLists.txt

@@ -52,7 +52,7 @@ project(
   HOMEPAGE_URL "http://jasp-stats.org/"
   DESCRIPTION "A fresh way to do statistics")
 
-#needed for R-Interface and QMLComponents for them to build stuff porperly when *inside* JASP
+#needed for R-Interface and jaspQMLControlsPlugin for them to build stuff porperly when *inside* JASP
 add_definitions(-DBUILDING_JASP)
 set(BUILDING_JASP TRUE)
 
@@ -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)