Fix QMake build for macOS and iOS

frankosterfeld · frankosterfeld · commit c729d0bc3a7d · 2021-03-31T08:36:52.000+01:00
Fixes frankosterfeld#188
diff --git a/qt5keychain.pri b/qt5keychain.pri
@@ -89,12 +89,7 @@ win32 {
         $$QTKEYCHAIN_PWD/libsecret.cpp
 }
 
-macx:!ios {
+macx|ios {
     LIBS += -framework Security -framework Foundation
-    SOURCES += $$QTKEYCHAIN_PWD/keychain_mac.cpp
-}
-
-ios {
-    LIBS += -framework Security -framework Foundation
-    OBJECTIVE_SOURCES += $$QTKEYCHAIN_PWD/keychain_ios.mm
+    OBJECTIVE_SOURCES += $$QTKEYCHAIN_PWD/keychain_apple.mm
 }

Original file line number	Diff line number	Diff line change
`@@ -89,12 +89,7 @@ win32 {`
`89`	`89`	`$$QTKEYCHAIN_PWD/libsecret.cpp`
`90`	`90`	`}`
`91`	`91`
`92`		`-macx:!ios {`
	`92`	`+macx\|ios {`
`93`	`93`	`LIBS += -framework Security -framework Foundation`
`94`		`- SOURCES += $$QTKEYCHAIN_PWD/keychain_mac.cpp`
`95`		`-}`
`96`		`-`
`97`		`-ios {`
`98`		`- LIBS += -framework Security -framework Foundation`
`99`		`- OBJECTIVE_SOURCES += $$QTKEYCHAIN_PWD/keychain_ios.mm`
	`94`	`+ OBJECTIVE_SOURCES += $$QTKEYCHAIN_PWD/keychain_apple.mm`
`100`	`95`	`}`