summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2009-12-17 02:51:39 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2009-12-17 02:51:39 (GMT)
commit608daaa6b0701cae456e1959614e70f4bd1419a2 (patch)
treece20697d7e92c39c00e5484510a95d2a5f747e71
parent6b07987e030deb402f51eda69b640ffd07f372d5 (diff)
parent8fdf9f14c662b8d92cd232e09baf526476fcb297 (diff)
downloadQt-608daaa6b0701cae456e1959614e70f4bd1419a2.zip
Qt-608daaa6b0701cae456e1959614e70f4bd1419a2.tar.gz
Qt-608daaa6b0701cae456e1959614e70f4bd1419a2.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: fix build with namespaced qt
-rw-r--r--tools/linguist/lrelease/main.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/linguist/lrelease/main.cpp b/tools/linguist/lrelease/main.cpp
index c45459a..b8e8eb2 100644
--- a/tools/linguist/lrelease/main.cpp
+++ b/tools/linguist/lrelease/main.cpp
@@ -55,6 +55,8 @@
#include <QtCore/QStringList>
#include <QtCore/QTextStream>
+QT_USE_NAMESPACE
+
#ifdef QT_BOOTSTRAPPED
static void initBinaryDir(
#ifndef Q_OS_WIN