summaryrefslogtreecommitdiffstats
path: root/tools/assistant
diff options
context:
space:
mode:
authorDavid Boddie <david.boddie@nokia.com>2010-10-04 14:12:39 (GMT)
committerDavid Boddie <david.boddie@nokia.com>2010-10-04 14:12:39 (GMT)
commit3ea28c383846a4af67ddd0c7d33dad0537a9972e (patch)
tree901f26b86b820ec4b4fc949ae38b6ce165b386af /tools/assistant
parent7cc2e423d39c3b519279d21cd3881f1a135913fd (diff)
parentd04664b9da6356d3c97e632fb35e27c6822e0dc9 (diff)
downloadQt-3ea28c383846a4af67ddd0c7d33dad0537a9972e.zip
Qt-3ea28c383846a4af67ddd0c7d33dad0537a9972e.tar.gz
Qt-3ea28c383846a4af67ddd0c7d33dad0537a9972e.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'tools/assistant')
-rw-r--r--tools/assistant/tools/qcollectiongenerator/main.cpp2
-rw-r--r--tools/assistant/tools/qhelpgenerator/main.cpp2
2 files changed, 4 insertions, 0 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]);