[pkg] fix makefile, installer

Makefile

@@ -206,10 +206,10 @@ ifeq (${PLATFORM}, darwin)
 	@cp build/bin/${PLATFORM}/bitmask-helper ${INST_DATA}/
 ifeq (${RELEASE}, yes)
 	@echo "[+] Running macdeployqt (release mode)"
-	@macdeployqt ${QTBUILD}/release/${PROVIDER}-vpn.app -qmldir=gui/qml ${MACDEPLOYQT_OPTS}
+	@macdeployqt ${QTBUILD}/release/${PROVIDER}-vpn.app -qmldir=gui/components ${MACDEPLOYQT_OPTS}
 else
 	@echo "[+] Running macdeployqt (debug mode)"
-	@macdeployqt ${QTBUILD}/release/${PROVIDER}-vpn.app -qmldir=gui/qml
+	@macdeployqt ${QTBUILD}/release/${PROVIDER}-vpn.app -qmldir=gui/components
 endif
 	@cp -r "${QTBUILD}/release/${TARGET}.app"/ ${INST_DATA}/
 endif

branding/scripts/gen-qtinstaller

@@ -8,7 +8,7 @@ import time
 
 from string import Template
 
-from provider import getDefaultProvider
+from provider import getDefaultProviders
 from provider import getProviderData
 
 OS_CONFIG = {
@@ -46,7 +46,7 @@ def getData():
 
     provider = os.environ.get('PROVIDER')
     if not provider:
-        provider = getDefaultProvider(config)
+        provider = getDefaultProviders(config)[0]
     return getProviderData(provider, config)
 
 def generateQtInstallerBoilerplate(data, platform, outDir):