From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Fri, 8 Mar 2013 17:46:29 +0000 (+0100)
Subject: make lupdate a host tool
X-Git-Tag: accepted/tizen/20131212.181521~106
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8b725e3f41e244c9f3d65a701c7242369fd88e11;p=platform%2Fupstream%2Fqttools.git

make lupdate a host tool

lupdate makes no sense on x-built targets at all.
though one may also argue whether it makes sense to actually bootstrap
it - while its use may be supported by the build system, it's typically
not part of regular builds, but rather used shortly before running
linguist - for which a host build of qt is necessary anyway.
one argument for bootstrapping is that it uses the qmldevtools library,
which logically should be bootstrapped (the only other current user is
qmlmin, which definitely *is* used in regular builds and thus needs
bootstrapping).

Change-Id: Ia3ddd901fe2b0c2b7b77af7f1ebc66d757fc7783
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
---

diff --git a/src/linguist/lupdate/lupdate.pro b/src/linguist/lupdate/lupdate.pro
index ee42568..da38078 100644
--- a/src/linguist/lupdate/lupdate.pro
+++ b/src/linguist/lupdate/lupdate.pro
@@ -1,3 +1,4 @@
+option(host_build)
 QT = core-private
 
 qtHaveModule(qmldevtools) {
diff --git a/src/linguist/lupdate/main.cpp b/src/linguist/lupdate/main.cpp
index 2d15901..cc0d42a 100644
--- a/src/linguist/lupdate/main.cpp
+++ b/src/linguist/lupdate/main.cpp
@@ -499,6 +499,7 @@ static void processProjects(bool topLevel, bool nestComplain, const QStringList
 int main(int argc, char **argv)
 {
     QCoreApplication app(argc, argv);
+#ifndef QT_BOOTSTRAPPED
 #ifndef Q_OS_WIN32
     QTranslator translator;
     QTranslator qtTranslator;
@@ -510,6 +511,7 @@ int main(int argc, char **argv)
         app.installTranslator(&qtTranslator);
     }
 #endif // Q_OS_WIN32
+#endif
 
     m_defaultExtensions = QLatin1String("java,jui,ui,c,c++,cc,cpp,cxx,ch,h,h++,hh,hpp,hxx,js,qs,qml");