Changeset 101243 in vbox for trunk

Timestamp:

Sep 22, 2023 4:26:33 PM (18 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

159226

Message:

configure: bugref:10450: Tweaking Qt6 support for configure script for macOS.

File:

• trunk/configure (modified) (2 diffs)

trunk/configure

@@ -1578 +1578 @@
     QT_TRIES="$QT6DIR /System/Library /Library"
     for t in $QT_TRIES; do
-      if [ -f "$t/Frameworks/QtCore.framework/QtCore" -o -f "$t/clang_64/lib/QtCore.framework/QtCore" ]; then
+      if [ -f "$t/Frameworks/QtCore.framework/QtCore" -o -f "$t/clang_64/lib/QtCore.framework/QtCore" -o -f "$t/lib/QtCore.framework/QtCore" ]; then
         PATH_SDK_QT6="$t"
         foundqt6=1
@@ -1586 +1586 @@
     # Add the necessary params for building the test application
     if [ -n "$PATH_SDK_QT6" ]; then
-      if [ -f "$t/clang_64/lib/QtCore.framework/QtCore" ]; then
+      if [ -f "$t/lib/QtCore.framework/QtCore" ]; then
+        INCQT6=-I$PATH_SDK_QT6/lib/QtCore.framework/Headers
+        LIBQT6=-F$PATH_SDK_QT6/lib
+        SDKQT6=$PATH_SDK_QT6
+      elif [ -f "$t/clang_64/lib/QtCore.framework/QtCore" ]; then
         INCQT6=-I$PATH_SDK_QT6/clang_64/lib/QtCore.framework/Headers
         LIBQT6=-F$PATH_SDK_QT6/clang_64/lib