Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7

2 files changed, 4 insertions, 0 deletions

diff --git a/tools/assistant/tools/qcollectiongenerator/main.cpp b/tools/assistant/tools/qcollectiongenerator/main.cpp
index 46e301c23f..fc9dc67c5d 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 637786cf8f..5e20b4e889 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]);