Merge branch '1.2.0-beta1' of https://github.com/pgmodeler/pgmodeler into 1.2.0-beta1

rkhaotix · rkhaotix · commit c20a4de5c732 · 2025-03-27T11:46:23.000-03:00
diff --git a/apps/pgmodeler/pgmodeler.pro b/apps/pgmodeler/pgmodeler.pro
@@ -20,11 +20,11 @@ macx {
 	macdeps.files = $$PWD/res/Info.plist $$PWD/res/PkgInfo
 
 	isEqual(PRIVATE_PLUGINS, true) {
-		macdeps.files = $$PRIV_RES_FOLDER/$$TARGET/Resources
+		macdeps.files += $$PRIV_RES_FOLDER/$$TARGET/Resources
 	}
 
 	isEqual(PRIVATE_PLUGINS, false) {
-		macdeps.files = $$PWD/res/Resources
+		macdeps.files += $$PWD/res/Resources
 	}
 
 	macdeps.path = $$PREFIX

Original file line number	Diff line number	Diff line change
`@@ -20,11 +20,11 @@ macx {`
`20`	`20`	`macdeps.files = $$PWD/res/Info.plist $$PWD/res/PkgInfo`
`21`	`21`
`22`	`22`	`isEqual(PRIVATE_PLUGINS, true) {`
`23`		`- macdeps.files = $$PRIV_RES_FOLDER/$$TARGET/Resources`
	`23`	`+ macdeps.files += $$PRIV_RES_FOLDER/$$TARGET/Resources`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`isEqual(PRIVATE_PLUGINS, false) {`
`27`		`- macdeps.files = $$PWD/res/Resources`
	`27`	`+ macdeps.files += $$PWD/res/Resources`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`macdeps.path = $$PREFIX`