build with gt6

hannesa2 · Jul 17, 2024 · 46dd4cb · 46dd4cb
1 parent 92c4331
commit 46dd4cb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/scripts/darwin/build.sh b/scripts/darwin/build.sh
@@ -17,12 +17,11 @@ if [[ $(uname -m) == 'arm64' ]]; then
   qmake ../BuildDltViewer.pro
 #  cmake ..
 else
-  Qt5_DIR="/usr/local/opt/qt"
+  Qt5_DIR="/usr/local/opt/qt@6"
   echo "Build with qmake $(uname -m) $Qt5_DIR"
   #qmake ../BuildDltViewer.pro
   #make
 fi
-
 #make
 
 echo Cleanup

diff --git a/scripts/darwin/install.sh b/scripts/darwin/install.sh
@@ -11,7 +11,7 @@ brew unlink qt@6 && brew link --force qt@6
 #brew link --overwrite qt@6 --force --overwrite
 # https://github.com/Homebrew/homebrew-core/issues/8392
 # https://github.com/Homebrew/legacy-homebrew/issues/29938
-QT_VERSION=$(brew list --versions qt@5 | awk '{print $2}')
+QT_VERSION=$(brew list --versions qt@6 | awk '{print $2}')
 echo "QT_VERSION=$QT_VERSION"
 if [[ -z "$QT_VERSION" ]]; then
     echo "QT_VERSION is empty"
@@ -32,8 +32,8 @@ if [[ $(uname -m) == 'arm64' ]]; then
 #  sudo ln -s -F "/opt/homebrew/Cellar/qt@6/${QT_VERSION}/plugins" /usr/local/plugins
 else
   echo "Run on MacOS x86"
-  sudo ln -s "/usr/local/Cellar/qt@5/${QT_VERSION}/mkspecs" /usr/local/mkspecs
-  sudo ln -s "/usr/local/Cellar/qt@5/${QT_VERSION}/plugins" /usr/local/plugins
+  sudo ln -s "/usr/local/Cellar/qt@6/${QT_VERSION}/mkspecs" /usr/local/mkspecs
+  sudo ln -s "/usr/local/Cellar/qt@6/${QT_VERSION}/plugins" /usr/local/plugins
 fi
 
 brew install ninja tree