Merge remote branch 'origin/4.7' into master-from-4.7

Conflicts:
	doc/src/snippets/code/doc_src_qmake-manual.qdoc
	src/corelib/arch/symbian/arch.pri
	src/declarative/graphicsitems/qdeclarativeflickable.cpp
	src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
	src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
	src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
	tests/auto/qfontmetrics/tst_qfontmetrics.cpp

1 files changed, 2 insertions, 0 deletions

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;