From 77fda24918bff693a20ae11eae64809a9c4689dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Garc=C3=ADa=20Garz=C3=B3n?= Date: Sun, 18 Jul 2010 05:17:22 +0200 Subject: Added *_location variables to pkg-config files for rcc, lupdate and lrelease Task-number: QTBUG-11546 Reviewed-by: ossi --- src/qbase.pri | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/qbase.pri b/src/qbase.pri index 064e67c..f6af22f 100644 --- a/src/qbase.pri +++ b/src/qbase.pri @@ -160,13 +160,25 @@ DEFINES *= QT_USE_FAST_OPERATOR_PLUS QT_USE_FAST_CONCATENATION TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end +qtPrepareTool(QMAKE_LUPDATE, lupdate) +qtPrepareTool(QMAKE_LRELEASE, lrelease) + moc_dir.name = moc_location moc_dir.variable = QMAKE_MOC uic_dir.name = uic_location uic_dir.variable = QMAKE_UIC -QMAKE_PKGCONFIG_VARIABLES += moc_dir uic_dir +rcc_dir.name = rcc_location +rcc_dir.variable = QMAKE_RCC + +lupdate_dir.name = lupdate_location +lupdate_dir.variable = QMAKE_LUPDATE + +lrelease_dir.name = lrelease_location +lrelease_dir.variable = QMAKE_LRELEASE + +QMAKE_PKGCONFIG_VARIABLES += moc_dir uic_dir rcc_dir lupdate_dir lrelease_dir include(qt_targets.pri) -- cgit v0.12