Merge branch '4.7-upstream' into 4.7-doc

5 files changed, 11 insertions, 1 deletions

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<argc; ++i) {
         arg = QString::fromLocal8Bit(argv[i]);
diff --git a/tools/assistant/tools/qhelpgenerator/main.cpp b/tools/assistant/tools/qhelpgenerator/main.cpp
index 637786c..5e20b4e 100644
--- a/tools/assistant/tools/qhelpgenerator/main.cpp
+++ b/tools/assistant/tools/qhelpgenerator/main.cpp
@@ -68,6 +68,7 @@ int main(int argc, char *argv[])
     bool checkLinks = false;
 
     QCoreApplication app(argc, argv);
+#ifndef Q_OS_WIN32
     QTranslator translator;
     QTranslator qtTranslator;
     QTranslator qt_helpTranslator;
@@ -80,6 +81,7 @@ int main(int argc, char *argv[])
         app.installTranslator(&qtTranslator);
         app.installTranslator(&qt_helpTranslator);
     }
+#endif // Q_OS_WIN32
 
     for (int i = 1; i < argc; ++i) {
         arg = QString::fromLocal8Bit(argv[i]);
diff --git a/tools/linguist/lconvert/main.cpp b/tools/linguist/lconvert/main.cpp
index d691548..2e397ad 100644
--- a/tools/linguist/lconvert/main.cpp
+++ b/tools/linguist/lconvert/main.cpp
@@ -140,6 +140,7 @@ struct File
 int main(int argc, char *argv[])
 {
     QCoreApplication app(argc, argv);
+#ifndef Q_OS_WIN32
     QTranslator translator;
     QTranslator qtTranslator;
     QString sysLocale = QLocale::system().name();
@@ -149,6 +150,7 @@ int main(int argc, char *argv[])
         app.installTranslator(&translator);
         app.installTranslator(&qtTranslator);
     }
+#endif // Q_OS_WIN32
 
     QStringList args = app.arguments();
     QList<File> 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");