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