wip

benma · Oct 30, 2024 · 8c0d7e9 · 8c0d7e9
1 parent df0909d
commit 8c0d7e9
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/frontends/qt/Makefile b/frontends/qt/Makefile
@@ -46,6 +46,9 @@ osx:
 	$(MAKE) clean
 	cd server && $(MAKE) macosx
 	$(MAKE) base
+	echo ${PATH}
+	ls ~/Qt6/6.2.4/macos/bin/qmake
+	qmake -version
 	qmake -set MACOS_MIN_VERSION $(MACOS_MIN_VERSION)
 	# See https://stackoverflow.com/questions/77136519/qmake-failing-with-sdk-14-ventura-13-5-2
 	qmake -early QMAKE_DEFAULT_LIBDIRS=$(shell xcrun -show-sdk-path)/usr/lib -o build/Makefile
@@ -54,9 +57,7 @@ osx:
 	mv build/BitBox.app build/osx/
 	cp resources/MacOS/Info.plist build/osx/BitBox.app/Contents/
 	cp resources/MacOS/icon.icns build/osx/BitBox.app/Contents/Resources/
-	# The `-executable` flag is needed to make the macOS build work when Qt is installed from homebrew.
-	# It works without it when Qt is installed using the official installer.
-	cd build/osx/ && macdeployqt BitBox.app -executable=BitBox.app/Contents/Frameworks/QtWebEngineCore.framework/Versions/Current/Helpers/QtWebEngineProcess.app/Contents/MacOS/QtWebEngineProcess
+	cd build/osx/ && macdeployqt BitBox.app
 	cp server/libserver.so build/osx/BitBox.app/Contents/Frameworks
 	cp build/assets.rcc build/osx/BitBox.app/Contents/MacOS/
 	install_name_tool -change libserver.so @executable_path/../Frameworks/libserver.so build/osx/BitBox.app/Contents/MacOS/BitBox