Merge pull request #77 from Guiguiprim/add-3drender

TheAssassin · web-flow · commit f292cc79ab80 · 2020-09-09T11:10:32.000+02:00
Add 3DRender in modules list (issue #76)
diff --git a/src/deployers/PluginsDeployerFactory.cpp b/src/deployers/PluginsDeployerFactory.cpp
@@ -68,7 +68,7 @@ std::vector<std::shared_ptr<PluginsDeployer>> PluginsDeployerFactory::getDeploye
         return {getInstance<QmlPluginsDeployer>(moduleName)};
     }
 
-    if (moduleName == "3dquickrender") {
+    if (moduleName == "3dquickrender" || moduleName == "3drender") {
         return {getInstance<Qt3DPluginsDeployer>(moduleName)};
     }
 
diff --git a/src/qt-modules.h b/src/qt-modules.h
@@ -23,6 +23,7 @@ static const std::vector<QtModule> QtModules = {
     {"3dextras", "libQt53DExtras", ""},
     {"3dinput", "libQt53DInput", ""},
     {"3dlogic", "libQt53DLogic", ""},
+    {"3drender", "libQt53DRender", ""},
     {"3dquickanimation", "libQt53DQuickAnimation", ""},
     {"3dquickextras", "libQt53DQuickExtras", ""},
     {"3dquickinput", "libQt53DQuickInput", ""},

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ std::vector<std::shared_ptr<PluginsDeployer>> PluginsDeployerFactory::getDeploye`
`68`	`68`	`return {getInstance<QmlPluginsDeployer>(moduleName)};`
`69`	`69`	`}`
`70`	`70`
`71`		`- if (moduleName == "3dquickrender") {`
	`71`	`+ if (moduleName == "3dquickrender" \|\| moduleName == "3drender") {`
`72`	`72`	`return {getInstance<Qt3DPluginsDeployer>(moduleName)};`
`73`	`73`	`}`
`74`	`74`