| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | From 0bc0db83812b5900dc4e6ffa96bdeab46b6adcae Mon Sep 17 00:00:00 2001 |
| 2 | From: Paul Eggleton <paul.eggleton@linux.intel.com> |
| 3 | Date: Wed, 26 Sep 2012 20:29:09 +0200 |
| 4 | Subject: [PATCH 06/21] configure: Use OE_QMAKE_* values to specify Qt utility |
| 5 | paths |
| 6 | |
| 7 | Upstream-Status: Inappropriate [configuration] |
| 8 | |
| 9 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> |
| 10 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
| 11 | --- |
| 12 | configure | 10 +++++----- |
| 13 | 1 file changed, 5 insertions(+), 5 deletions(-) |
| 14 | |
| 15 | diff --git a/configure b/configure |
| 16 | index 5a7c4ee..db4d044 100755 |
| 17 | --- a/configure |
| 18 | +++ b/configure |
| 19 | @@ -8683,11 +8683,11 @@ QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOURCE_TREE |
| 20 | QMAKE_MOC_SRC = \$\$QT_BUILD_TREE/src/moc |
| 21 | |
| 22 | #local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR |
| 23 | -QMAKE_MOC = \$\$QT_BUILD_TREE/bin/moc |
| 24 | -QMAKE_UIC = \$\$QT_BUILD_TREE/bin/uic |
| 25 | -QMAKE_UIC3 = \$\$QT_BUILD_TREE/bin/uic3 |
| 26 | -QMAKE_RCC = \$\$QT_BUILD_TREE/bin/rcc |
| 27 | -QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp |
| 28 | +QMAKE_MOC = \${OE_QMAKE_MOC} |
| 29 | +QMAKE_UIC = \${OE_QMAKE_UIC} |
| 30 | +QMAKE_UIC3 = \${OE_QMAKE_UIC3} |
| 31 | +QMAKE_RCC = \${OE_QMAKE_RCC} |
| 32 | +QMAKE_QDBUSXML2CPP = \${OE_QMAKE_QDBUSXML2CPP} |
| 33 | QMAKE_INCDIR_QT = \$\$QT_BUILD_TREE/include |
| 34 | QMAKE_LIBDIR_QT = \$\$QT_BUILD_TREE/lib |
| 35 | |
| 36 | -- |
| 37 | 1.8.0 |
| 38 | |