diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-12-26 19:49:55 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-12-26 19:49:55 (GMT) |
| commit | 24270550463fbc81c7725595719e6e21eade2819 (patch) | |
| tree | 4e7c118ed3c4b42e43403960365a2672441ea05e /tools/linguist | |
| parent | 4376f8871b4422830e9ffb7f3acbc29766d8d218 (diff) | |
| parent | 444fb94e02308bedc7b37a702adb95b740168a94 (diff) | |
| download | Qt-24270550463fbc81c7725595719e6e21eade2819.zip Qt-24270550463fbc81c7725595719e6e21eade2819.tar.gz Qt-24270550463fbc81c7725595719e6e21eade2819.tar.bz2 | |
Merge branch '4.6'
Conflicts:
examples/webkit/fancybrowser/main.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
tools/assistant/tools/assistant/bookmarkmanager.cpp
Diffstat (limited to 'tools/linguist')
| -rw-r--r-- | tools/linguist/lrelease/main.cpp | 2 |
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 |