Merge branch '4.6'

Conflicts:
	src/corelib/io/qdatastream.h

1 files changed, 4 insertions, 3 deletions

diff --git a/src/scripttools/debugging/qscriptdebuggerstackmodel.cpp b/src/scripttools/debugging/qscriptdebuggerstackmodel.cpp
index a63ea73..2d56e17 100644
--- a/src/scripttools/debugging/qscriptdebuggerstackmodel.cpp
+++ b/src/scripttools/debugging/qscriptdebuggerstackmodel.cpp
@@ -45,6 +45,7 @@
 
 #include <QtScript/qscriptcontextinfo.h>
 #include <QtCore/qfileinfo.h>
+#include <QtCore/qcoreapplication.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -157,11 +158,11 @@ QVariant QScriptDebuggerStackModel::headerData(int section, Qt::Orientation orie
         return QVariant();
     if (role == Qt::DisplayRole) {
         if (section == 0)
-            return QObject::tr("Level");
+            return QCoreApplication::translate("QScriptDebuggerStackModel", "Level");
         else if (section == 1)
-            return QObject::tr("Name");
+            return QCoreApplication::translate("QScriptDebuggerStackModel", "Name");
         else if (section == 2)
-            return QObject::tr("Location");
+            return QCoreApplication::translate("QScriptDebuggerStackModel", "Location");
     }
     return QVariant();
 }