modules/gui/qt/meson.build

@@ -543,6 +543,55 @@ if qt5_dep.found()
 
     qt_sources = files('qt.cpp')
 
+    # Qt plugins
+    qt_static_check = '''
+    #include <qconfig.h>
+    #ifndef QT_STATIC
+    #error Qt using shared libraries
+    #endif
+    '''
+    if cpp.compiles(qt_static_check, dependencies: qt5_dep, name: 'Qt5 compiled with static libraries')
+        qt_extra_deps += [
+            dependency('qtgraphicaleffectsplugin',  required: false),
+            dependency('qtquick2plugin ',           required: false),
+            dependency('qtquickcontrols2plugin',    required: false),
+            dependency('qtquicktemplates2plugin',   required: false),
+            dependency('qquicklayoutsplugin',       required: false),
+            dependency('windowplugin',              required: false),
+            dependency('qmlshapesplugin',           required: false),
+            dependency('qmlplugin',                 required: false),
+            dependency('modelsplugin',              required: false),
+            dependency('qsvg',                      required: false),
+            dependency('qsvgicon',                  required: false),
+            dependency('qtgraphicaleffectsprivate', required: false),
+            dependency('qjpeg',                     required: false),
+        ]
+
+        qt_extra_deps += [
+            dependency('qxcb-glx-integration',      required: false),
+            dependency('qxcb',                      required: false),
+        ]
+
+        qt_extra_deps += [
+            dependency('qwayland-generic',          required: false),
+            dependency('qwayland-egl',              required: false),
+            dependency('xdg-shell',                 required: false),
+        ]
+
+        if host_system == 'windows'
+            qt_extra_deps += [
+                dependency('qwindows',              required: false),
+                dependency('qwindowsvistastyle',    required: false),
+            ]
+        endif
+
+        if host_system == 'darwin'
+            qt_extra_deps += [
+                dependency('qcocoa',                required: false),
+            ]
+        endif
+    endif
+
     if host_system == 'windows'
         qt_extra_deps += [
             cc.find_library('comctl32'),
@@ -573,14 +622,53 @@ if qt5_dep.found()
         endif
     endif
 
+    # Qt5 wayland
+    wayland_qt5_dep = dependency('qt5', modules: ['WaylandClient'], required: false)
+
+    if wayland_qt5_dep.found()
+        qt_extra_deps += [wayland_dep]
+        qt_extra_flags += '-DQT5_HAS_WAYLAND'
+    endif
+
     if get_option('qt_qml_debug')
         qt_extra_flags += '-DQT_QML_DEBUG'
     endif
 
     if host_system == 'windows'
         qt_cppargs += libcom_cppflags
+        qt_extra_flags += '-DQPNI_HEADER=<' + qt5_dep.version() + '/QtGui/qpa/qplatformnativeinterface.h>'
+    endif
+
+    if not (host_system in ['windows', 'darwin'])
+        #Qt GTK theme module
+        gtk_dep = dependency(
+            'gtk+-3.0',
+            version: '>=3.20',
+            required: get_option('qt_gtk')
+        )
+
+        if gtk_dep.found()
+            vlc_modules += {
+                'name' : 'qt_gtktheme',
+                'sources' : files(
+                    'style/gtkthemeprovider/gtk_compat.cpp',
+                    'style/gtkthemeprovider/gtk_compat.h',
+                    'style/gtkthemeprovider/gtkthemeprovider.cpp',
+                    'style/gtkthemeprovider/gtk_util.cpp',
+                    'style/gtkthemeprovider/gtk_util.h',
+                    'style/gtkthemeprovider/nav_button_provider_gtk.cpp',
+                    'style/gtkthemeprovider/nav_button_provider_gtk.h',
+                    'style/gtkthemeprovider/scoped_gobject.h'
+                ),
+                'dependencies' : [gtk_dep]
+            }
+
+            qt_extra_flags += '-DQT5_HAS_GTK'
+        endif
     endif
 
+    # TODO support qmlcachegen
+
     vlc_modules += {
         'name' : 'qt',
         'sources' : [qt5pre_files, qt_sources, some_sources],
@@ -590,28 +678,4 @@ if qt5_dep.found()
         'cpp_args' : [qt_extra_flags, qt_cppargs]
     }
 
-    #Qt GTK theme module
-    gtk_dep = dependency(
-      'gtk+-3.0',
-      version: '>=3.20',
-      required: get_option('qt_gtk')
-    )
-
-    if gtk_dep.found()
-      vlc_modules += {
-         'name' : 'qt_gtktheme',
-         'sources' : files(
-             'style/gtkthemeprovider/gtk_compat.cpp',
-             'style/gtkthemeprovider/gtk_compat.h',
-             'style/gtkthemeprovider/gtkthemeprovider.cpp',
-             'style/gtkthemeprovider/gtk_util.cpp',
-             'style/gtkthemeprovider/gtk_util.h',
-             'style/gtkthemeprovider/nav_button_provider_gtk.cpp',
-             'style/gtkthemeprovider/nav_button_provider_gtk.h',
-             'style/gtkthemeprovider/scoped_gobject.h'
-         ),
-        'dependencies' : [gtk_dep]
-      }
-    endif
-
 endif

modules/meson.build

@@ -231,11 +231,13 @@ subdir('lua')
 if qt5_dep.found()
     executable('vlc-qt-check',
         files('gui/qt/vlc-qt-check.cpp'),
-        dependencies: [qt5_dep],
+        dependencies: [qt5_dep, qt_extra_deps],
         include_directories: [vlc_include_dirs],
         build_by_default: true,
         install: true,
-        install_dir: get_option('libexecdir')
+        install_dir: get_option('libexecdir'),
+        c_args : qt_extra_flags,
+        cpp_args : qt_extra_flags,
     )
 endif