| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 1 | From 577e21622475fa29fd471149cf2380c53fdbfcbd Mon Sep 17 00:00:00 2001 |
| 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> |
| 3 | Date: Tue, 6 Mar 2018 22:26:48 +0100 |
| 4 | Subject: [PATCH] Add configure option to find qt5 native tools |
| 5 | MIME-Version: 1.0 |
| 6 | Content-Type: text/plain; charset=UTF-8 |
| 7 | Content-Transfer-Encoding: 8bit |
| 8 | |
| 9 | Pkg-config checks for target locations. With these qt5 tools as uic/moc.. |
| 10 | cannot be used. |
| 11 | |
| 12 | Upstream-Status: Inappropriate [embedded specific] |
| 13 | |
| 14 | Signed-off-by: Andreas MΓΌller <schnitzeltony@gmail.com> |
| 15 | --- |
| 16 | configure.ac | 6 +++++- |
| 17 | 1 file changed, 5 insertions(+), 1 deletion(-) |
| 18 | |
| 19 | diff --git a/configure.ac b/configure.ac |
| 20 | index cdd831a..fdd192b 100644 |
| 21 | --- a/configure.ac |
| 22 | +++ b/configure.ac |
| 23 | @@ -1133,11 +1133,15 @@ if test "${enable_qt}" = yes ; then |
| 24 | else |
| 25 | try_qt4=yes |
| 26 | fi |
| 27 | + AC_ARG_WITH(qt5nativesysroot, |
| 28 | + AC_HELP_STRING([--with-qt5nativesysroot=PATH], [prepend path - for native qt5 tools]), |
| 29 | + [QT5NATIVESYSROOT="$withval"], [QT5NATIVESYSROOT=""]) |
| 30 | + |
| 31 | if test "x${with_qt}" != "xqt4"; then |
| 32 | PKG_CHECK_MODULES_NOFAIL(QT, [Qt5Core Qt5Gui Qt5Network Qt5Svg Qt5PrintSupport]) |
| 33 | if test $pkg_failed = no; then |
| 34 | try_qt4=no |
| 35 | - QT5LOC=`$PKG_CONFIG --variable=host_bins Qt5Core` |
| 36 | + QT5LOC=${QT5NATIVESYSROOT}`$PKG_CONFIG --variable=host_bins Qt5Core` |
| 37 | if test "x${QT5LOC}" != "x"; then |
| 38 | UIC=${QT5LOC}/uic |
| 39 | MOC=${QT5LOC}/moc |
| 40 | -- |
| 41 | 2.14.3 |
| 42 | |