#1304: Switch back to Qt6_DIR

pbek · Jan 28, 2023 · 5f3d931 · 5f3d931
1 parent 4566750
commit 5f3d931
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/build-systems/github/macos/create-dmg-qt6.sh b/build-systems/github/macos/create-dmg-qt6.sh
@@ -17,6 +17,7 @@ if [ "$NAME" != "Darwin" ]; then
 fi
 
 env
+find ${Qt6_DIR}
 
 echo "Changing bundle identifier"
 sed -i -e 's/com.yourcompany.QOwnNotes/com.PBE.QOwnNotes/g' $PLIST
@@ -33,8 +34,8 @@ rm -f ${PLIST}-e
 
 # copy translation files to app
 cp languages/*.qm $APP.app/Contents/Resources
-cp ${QT_DIR}/translations/qtbase_*.qm $APP.app/Contents/Resources
-#cp ${QT_DIR}/translations/qt_*.qm $APP.app/Contents/Resources
+cp ${Qt6_DIR}/translations/qtbase_*.qm $APP.app/Contents/Resources
+#cp ${Qt6_DIR}/translations/qt_*.qm $APP.app/Contents/Resources
 #rm $APP.app/Contents/Resources/qt_help_*.qm
 
 # copy updater script to app
@@ -43,7 +44,8 @@ cp ${QT_DIR}/translations/qtbase_*.qm $APP.app/Contents/Resources
 
 # use macdeployqt to deploy the application
 echo "Calling macdeployqt"
-${QT_DIR}/bin/macdeployqt ./$APP.app
+#${Qt6_DIR}/bin/macdeployqt ./$APP.app
+macdeployqt ./$APP.app
 if [ "$?" -ne "0" ]; then
     echo "Failed to run macdeployqt"
     exit 1