From 77e3d8b08fdee9fc9ba4457c18b723f7c80bf448 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Tue, 3 Jul 2012 20:10:38 +0200
Subject: [PATCH] "export" the linguist tools for qtPrepareTool() use

Change-Id: I2f7dee558e286e81b0f6a79bc428d1e5cda3321a
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
---
 src/linguist/lconvert/lconvert.pro | 23 +++++------------------
 src/linguist/lrelease/lrelease.pro | 15 ++++-----------
 src/linguist/lupdate/lupdate.pro   | 23 ++++-------------------
 3 files changed, 13 insertions(+), 48 deletions(-)

diff --git a/src/linguist/lconvert/lconvert.pro b/src/linguist/lconvert/lconvert.pro
index 89128d8..555f239 100644
--- a/src/linguist/lconvert/lconvert.pro
+++ b/src/linguist/lconvert/lconvert.pro
@@ -1,23 +1,10 @@
+DESTDIR = $$QT.designer.bins
 
-TEMPLATE = app
-TARGET = lconvert
-DESTDIR         = $$QT.designer.bins
-
-QT -= gui
-QT += core-private
-
-CONFIG          += qt warn_on console
-CONFIG          -= app_bundle
+QT = core-private
+DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII
 
-build_all:!build_pass {
-    CONFIG -= build_all
-    CONFIG += release
-}
+SOURCES += main.cpp
 
 include(../shared/formats.pri)
 
-DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII
-SOURCES += main.cpp
-
-target.path=$$[QT_INSTALL_BINS]
-INSTALLS        += target
+load(qt_tool)
diff --git a/src/linguist/lrelease/lrelease.pro b/src/linguist/lrelease/lrelease.pro
index 83ee312..20e137b 100644
--- a/src/linguist/lrelease/lrelease.pro
+++ b/src/linguist/lrelease/lrelease.pro
@@ -1,20 +1,13 @@
 load(qt_build_config)
 
-TEMPLATE        = app
-TARGET          = lrelease
-DESTDIR         = $$QT.designer.bins
-
-QT              -= gui
-QT              += core-private
-
-CONFIG          += qt warn_on console
-CONFIG          -= app_bundle
+DESTDIR = $$QT.designer.bins
 
+QT = core-private
 DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII
+
 SOURCES += main.cpp
 
 include(../shared/formats.pri)
 include(../shared/proparser.pri)
 
-target.path=$$[QT_INSTALL_BINS]
-INSTALLS        += target
+load(qt_tool)
diff --git a/src/linguist/lupdate/lupdate.pro b/src/linguist/lupdate/lupdate.pro
index 61f260a..36b7fe4 100644
--- a/src/linguist/lupdate/lupdate.pro
+++ b/src/linguist/lupdate/lupdate.pro
@@ -1,19 +1,9 @@
 load(qt_build_config)
 
-TEMPLATE        = app
-TARGET          = lupdate
-DESTDIR          = $$QT.designer.bins
+DESTDIR = $$QT.designer.bins
 
-QT              -= gui
-QT              += core-private qmldevtools-private
-
-CONFIG          += qt warn_on console
-CONFIG          -= app_bundle
-
-build_all:!build_pass {
-    CONFIG -= build_all
-    CONFIG += release
-}
+QT = core-private qmldevtools-private
+DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
 
 include(../shared/formats.pri)
 include(../shared/proparser.pri)
@@ -32,9 +22,6 @@ HEADERS += \
     lupdate.h \
     ../shared/simtexth.h
 
-DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
-
-
 win32:RC_FILE = winmanifest.rc
 
 embed_manifest_exe:win32-msvc2005 {
@@ -43,6 +30,4 @@ embed_manifest_exe:win32-msvc2005 {
     QMAKE_POST_LINK += $$quote(mt.exe -updateresource:$$DESTDIR/lupdate.exe -manifest \"$${PWD}\\lupdate.exe.manifest\")
 }
 
-target.path=$$[QT_INSTALL_BINS]
-INSTALLS        += target
-
+load(qt_tool)
-- 
2.7.4