From 64c2fa1d2ad0133462c9a6fbf8fa365b99e7de2d Mon Sep 17 00:00:00 2001 From: Victor Ostashevsky Date: Tue, 28 Sep 2010 19:19:53 +0200 Subject: Don't use translations for console tools under windows Task-number: QTBUG-13619 Merge-request: 2486 Reviewed-by: Oswald Buddenhagen --- tools/assistant/tools/qcollectiongenerator/main.cpp | 2 ++ tools/assistant/tools/qhelpgenerator/main.cpp | 2 ++ tools/linguist/lconvert/main.cpp | 2 ++ tools/linguist/lrelease/main.cpp | 4 +++- tools/linguist/lupdate/main.cpp | 2 ++ 5 files changed, 11 insertions(+), 1 deletion(-) diff --git a/tools/assistant/tools/qcollectiongenerator/main.cpp b/tools/assistant/tools/qcollectiongenerator/main.cpp index 46e301c..fc9dc67 100644 --- a/tools/assistant/tools/qcollectiongenerator/main.cpp +++ b/tools/assistant/tools/qcollectiongenerator/main.cpp @@ -354,6 +354,7 @@ int main(int argc, char *argv[]) bool showVersion = false; QCoreApplication app(argc, argv); +#ifndef Q_OS_WIN32 QTranslator translator; QTranslator qtTranslator; QTranslator qt_helpTranslator; @@ -366,6 +367,7 @@ int main(int argc, char *argv[]) app.installTranslator(&qtTranslator); app.installTranslator(&qt_helpTranslator); } +#endif // Q_OS_WIN32 for (int i=1; i inFiles; diff --git a/tools/linguist/lrelease/main.cpp b/tools/linguist/lrelease/main.cpp index 19377ef..5e6edb4 100644 --- a/tools/linguist/lrelease/main.cpp +++ b/tools/linguist/lrelease/main.cpp @@ -191,6 +191,7 @@ int main(int argc, char **argv) ); #else QCoreApplication app(argc, argv); +#ifndef Q_OS_WIN32 QTranslator translator; QTranslator qtTranslator; QString sysLocale = QLocale::system().name(); @@ -200,7 +201,8 @@ int main(int argc, char **argv) app.installTranslator(&translator); app.installTranslator(&qtTranslator); } -#endif +#endif // Q_OS_WIN32 +#endif // QT_BOOTSTRAPPED ConversionData cd; cd.m_verbose = true; // the default is true starting with Qt 4.2 diff --git a/tools/linguist/lupdate/main.cpp b/tools/linguist/lupdate/main.cpp index d96e205..49906e0 100644 --- a/tools/linguist/lupdate/main.cpp +++ b/tools/linguist/lupdate/main.cpp @@ -412,6 +412,7 @@ static void processProjects( int main(int argc, char **argv) { QCoreApplication app(argc, argv); +#ifndef Q_OS_WIN32 QTranslator translator; QTranslator qtTranslator; QString sysLocale = QLocale::system().name(); @@ -421,6 +422,7 @@ int main(int argc, char **argv) app.installTranslator(&translator); app.installTranslator(&qtTranslator); } +#endif // Q_OS_WIN32 m_defaultExtensions = QLatin1String("java,jui,ui,c,c++,cc,cpp,cxx,ch,h,h++,hh,hpp,hxx,js,qs,qml"); -- cgit v0.12