meson.build

@@ -328,14 +328,6 @@ else
     have_osx = false
 endif
 
-if have_osx
-    add_project_arguments('-mmacosx-version-min=10.11',
-        language: ['c', 'cpp', 'objc'])
-    add_project_link_arguments('-mmacosx-version-min=10.11',
-        language: ['c', 'cpp', 'objc'])
-endif
-
-
 #
 # Windows and MinGW checks
 #

modules/codec/meson.build

@@ -567,6 +567,7 @@ if host_system == 'darwin'
 endif
 
 # FFmpeg common helper library
+libavcodec_common = disabler()
 if avcodec_dep.found()
     libavcodec_common = static_library('avcodec_common',
         files('avcodec/fourcc.c', 'avcodec/chroma.c'),

modules/gui/qt/meson.build

@@ -1149,7 +1149,7 @@ if qt6_dep.found()
         'name' : 'qt',
         'sources' : [qt6pre_files, qt6pre_qrc, shader_targets, shaders_processed, qt_sources, some_sources],
         'extra_files' : [shader_files],
-        'dependencies' : [qt_extra_deps, qt6_dep],
+        'dependencies' : [qt_extra_deps, qt6_dep, corefoundation_dep],
         'include_directories' : qt_include_dir,
         'c_args' : qt_extra_flags,
         'cpp_args' : [qt_extra_flags, qt_cppargs],
@@ -1157,26 +1157,6 @@ if qt6_dep.found()
         'link_with' : qmllibs,
     }
 
-    quicktest_qt6_dep = dependency('qt6', version: '=' + qt6_dep.version(), modules: ['QuickTest'], required: false)
-    if quicktest_qt6_dep.found()
-        qml_test_moc = qt6.compile_moc(
-            headers : files('tests/qml_test.hpp'),
-            dependencies : [quicktest_qt6_dep, qt6_dep]
-        )
-        qml_test = executable(
-          'qml_test',
-          [files('tests/qml_test.cpp', 'tests/qml_test.hpp'), qml_test_moc],
-          qt6pre_qrc,
-          build_by_default: false,
-          dependencies: [quicktest_qt6_dep, qt6_dep],
-          link_with: qmllibs,
-          cpp_args: ['-DQUICK_TEST_SOURCE_DIR="' + meson.current_source_dir() + '/tests"']
-        )
-        foreach test_name, test_file : qml_tests
-              test(test_name, qml_test, args: ['-input', test_file], suite:'qt')
-        endforeach
-    endif
-
     vlc_tests += {
         'name': 'base_model_test',
         'sources': files(
@@ -1267,6 +1247,26 @@ if qt6_dep.found()
             'link_with': [libvlccore, libvlc],
             'dependencies': [qt6_dep, qt_extra_deps, qtest_qt6_dep],
         }
+    endif
 
+    quicktest_qt6_dep = dependency('qt6', version: '=' + qt6_dep.version(), modules: ['QuickTest'], required: false)
+    if quicktest_qt6_dep.found() and  qtest_qt6_dep.found()
+        qml_test_moc = qt6.compile_moc(
+            headers : files('tests/qml_test.hpp'),
+            dependencies : [quicktest_qt6_dep, qt6_dep]
+        )
+        qml_test = executable(
+          'qml_test',
+          [files('tests/qml_test.cpp', 'tests/qml_test.hpp'), qml_test_moc],
+          qt6pre_qrc,
+          build_by_default: false,
+          dependencies: [quicktest_qt6_dep, qt6_dep, qtest_qt6_dep],
+          link_with: qmllibs,
+          cpp_args: ['-DQUICK_TEST_SOURCE_DIR="' + meson.current_source_dir() + '/tests"']
+        )
+        foreach test_name, test_file : qml_tests
+              test(test_name, qml_test, args: ['-input', test_file], suite:'qt')
+        endforeach
     endif
+
 endif

modules/gui/qt/shaders/meson.build

@@ -23,8 +23,8 @@ shader_sources = [
 
 shader_files = files(shader_sources)
 
-qt_bin_directory = qt6_dep.get_variable(pkgconfig: 'bindir', configtool: '-query QT_HOST_BINS')
-qsb = find_program(qt_bin_directory + '/qsb', required: true)
+qt_bin_directory = qt6_dep.get_variable(pkgconfig: 'bindir', configtool: 'QT_HOST_BINS')
+qsb = find_program('qsb', dirs: qt_bin_directory, required: true)
 
 qsb_params = ['--glsl=100 es,120,150', '--batchable', '-O']
 if host_system == 'windows'