Skip to content
Snippets Groups Projects
Commit 42e20881 authored by Jan Schmidt's avatar Jan Schmidt
Browse files

qt5: Don't fail if qmake isn't available

Don't break the build if the Qt5 libs are available but the
command-line tool isn't.

Reported in gstreamer/gst-plugins-base#780 (comment 548092)
parent 8c8b788f
No related branches found
No related tags found
No related merge requests found
Pipeline #166650 waiting for manual action
......@@ -84,7 +84,7 @@ if not have_qpa_include
endif
endif
if not have_qpa_include
qmake = find_program('qmake-qt5', 'qmake')
qmake = find_program('qmake-qt5', 'qmake', required: false)
if qmake.found()
qt_version = run_command(qmake, '-query', 'QT_VERSION').stdout().strip()
qt_include_dir = run_command(qmake, '-query', 'QT_INSTALL_HEADERS').stdout().strip()
......@@ -98,6 +98,9 @@ if not have_qpa_include
endif
endif
endif
:q
:q
# Try to come up with all the platform/winsys combinations that will work
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment