projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e7b84b0
)
meson: Search for qmake-qt5 before qmake
author
Nirbheek Chauhan
<nirbheek@centricular.com>
Fri, 18 Jan 2019 09:11:14 +0000
(14:41 +0530)
committer
Nirbheek Chauhan
<nirbheek@centricular.com>
Fri, 18 Jan 2019 09:11:14 +0000
(14:41 +0530)
The canonical name for the binary is qmake-qt5, and qmake is the
generic name that can also be a qt4 qmake.
ext/qt/meson.build
patch
|
blob
|
history
diff --git
a/ext/qt/meson.build
b/ext/qt/meson.build
index
6fee167
..
3338265
100644
(file)
--- a/
ext/qt/meson.build
+++ b/
ext/qt/meson.build
@@
-49,7
+49,7
@@
if have_cxx and build_gstgl
endif
endif
if not have_qpa_include
- qmake = find_program('qmake')
+ qmake = find_program('qmake
-qt5', 'qmake
')
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()