[vlc-commits] [Git][videolan/vlc][master] 3 commits: configure: prioritize the system qtpaths6

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
936ccbcd by Steve Lhomme at 2024-05-25T07:27:28+00:00
configure: prioritize the system qtpaths6

For native build it's important to get that one.
For other builds, we pass the qtconf file anyway, it doesn't matter which one is used.

Co-authored-by: Fatih Uzunoglu <fuzun54 at outlook.com>

- - - - -
391a6bb9 by Steve Lhomme at 2024-05-25T07:27:28+00:00
configure: add an option to force the qtconf used

By default we use the contrib one if it's there, or we let qtpaths6 decide.

- - - - -
462f1852 by Steve Lhomme at 2024-05-25T07:27:28+00:00
meson: remove stray qtvlcdeps dependency

- - - - -


2 changed files:

- configure.ac
- modules/gui/qt/meson.build


Changes:

=====================================
configure.ac
=====================================
@@ -3973,16 +3973,24 @@ have_qt_core_private="no"
 have_fxc="no"
 AS_IF([test "${enable_qt}" != "no"], [
   have_qt="yes"
-  AC_PATH_PROGS(QTPATHS6, [qtpaths6], qtpaths6, ["${CONTRIB_DIR}/../bin:$PATH"])
-
-  QT_PATHS=${QTPATHS6}
-  AC_MSG_CHECKING([if contribs provide target_qt.conf])
-  AS_IF([test -e "${CONTRIB_DIR}/bin/target_qt.conf"], [
-      QT_CONF=${CONTRIB_DIR}/bin/target_qt.conf
-      QT_PATHS="${QT_PATHS} --qtconf ${QT_CONF}"
+  AC_PATH_PROGS(QTPATHS6, [qtpaths6], qtpaths6, ["$PATH:${CONTRIB_DIR}/../bin"])
+
+  AC_ARG_WITH([qtconf],
+    AS_HELP_STRING([--with-qtconf=PATH], [location of Qt6 qt.conf file (auto)])
+  )
+  AS_IF([test -z "${with_qtconf}"], [
+    AC_MSG_CHECKING([if contribs provide target_qt.conf])
+    AS_IF([test -e "${CONTRIB_DIR}/bin/target_qt.conf"], [
+      with_qtconf=${CONTRIB_DIR}/bin/target_qt.conf
       AC_MSG_RESULT([yes])
-  ],[
+    ],[
       AC_MSG_RESULT([no])
+    ])
+  ])
+
+  QT_PATHS=${QTPATHS6}
+  AS_IF([test -n "${with_qtconf}"], [
+    QT_PATHS="${QT_PATHS} --qtconf ${with_qtconf}"
   ])
 
   QT_MINIMUM_VERSION=6.2
@@ -4000,8 +4008,8 @@ AS_IF([test "${enable_qt}" != "no"], [
 
   QT_BIN_DIRECTORY="$(${QT_PATHS}         --query QT_HOST_BINS 2>/dev/null)"
   QMAKE="${QT_BIN_DIRECTORY}/qmake"
-  AS_IF([test -n "${QT_CONF}"],[
-      QMAKE="${QMAKE} -qtconf ${QT_CONF}"
+  AS_IF([test -n "${with_qtconf}"],[
+      QMAKE="${QMAKE} -qtconf ${with_qtconf}"
   ])
   AC_MSG_NOTICE([using ${QMAKE}])
 
@@ -4055,10 +4063,10 @@ AS_IF([test "${enable_qt}" != "no"], [
       ])
 
       AC_CHECK_PROGS(PYTHON3, [python3], [no])
-      AC_MSG_CHECKING([if required Qt plugins are installed with ${QTPATHS6} and conf ${QT_CONF}])
+      AC_MSG_CHECKING([if required Qt plugins are installed with ${QTPATHS6} and conf ${with_qtconf}])
       AS_IF([test "$PYTHON3" != "no" && ${PYTHON3} ${srcdir}/buildsystem/check_qml_module.py \
             --qtpaths "${QTPATHS6}" \
-            --qtconf "${QT_CONF}" \
+            --qtconf "${with_qtconf}" \
             --modules \
             QtQml.Models="" \
             QtQml.WorkerScript="" \
@@ -4080,7 +4088,7 @@ AS_IF([test "${enable_qt}" != "no"], [
       AS_IF([test $ac_status = 0 && test -f ${ac_pwd}/modules/gui/qt/qmake-quicktest],[
         AS_IF([test "$PYTHON3" != "no" && ${PYTHON3} ${srcdir}/buildsystem/check_qml_module.py \
         --qtpaths "${QTPATHS6}" \
-        --qtconf "${QT_CONF}" \
+        --qtconf "${with_qtconf}" \
         --modules QtTest="" \
         >&AS_MESSAGE_FD ], [
             echo 'get_cflags:'                     >> ${ac_pwd}/modules/gui/qt/qmake-quicktest


=====================================
modules/gui/qt/meson.build
=====================================
@@ -567,16 +567,6 @@ if qt6_dep.found()
     subdir('shaders')
 
     # Qt plugins
-    qt_static_check = '''
-    #include <qconfig.h>
-    #ifndef QT_STATIC
-    #error Qt using shared libraries
-    #endif
-    '''
-    if cpp.compiles(qt_static_check, dependencies: qt6_dep, name: 'Qt6 compiled with static libraries')
-        qt_extra_deps += dependency('qtvlcdeps', required: true)
-    endif
-
     if host_system == 'windows'
         qt_extra_deps += [
             cc.find_library('dwmapi'),



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/1910bdd991d0c1729599656b686758086268fb1e...462f18522399089b9dfc5e5cd4559e1518c74b4f

-- 
This project does not include diff previews in email notifications.
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/1910bdd991d0c1729599656b686758086268fb1e...462f18522399089b9dfc5e5cd4559e1518c74b4f
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance