diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp
index 3fe705054678e4f35100ed145954583a2db243b6..e876c6fc3caa45b4bbfdeccb9c888958d442a558 100644
--- a/src/plugins/texteditor/basetexteditor.cpp
+++ b/src/plugins/texteditor/basetexteditor.cpp
@@ -6149,7 +6149,7 @@ void BaseTextEditorWidget::appendStandardContextMenuActions(QMenu *menu)
         menu->addAction(a);
 
     BaseTextDocument *doc = baseTextDocument();
-    if (doc->codec()->name() == QString(QLatin1String("UTF-8"))) {
+    if (doc->codec()->name() == QByteArray("UTF-8")) {
         a = Core::ActionManager::command(Constants::SWITCH_UTF8BOM)->action();
         if (a && a->isEnabled()) {
             a->setText(doc->format().hasUtf8Bom ? tr("Delete UTF-8 BOM on Save")
diff --git a/src/plugins/texteditor/behaviorsettingswidget.cpp b/src/plugins/texteditor/behaviorsettingswidget.cpp
index 32b930893e009244e4812ea348abd0429bcb9a45..abc9549a07ae18e2b4e9cabc633524380d8b993b 100644
--- a/src/plugins/texteditor/behaviorsettingswidget.cpp
+++ b/src/plugins/texteditor/behaviorsettingswidget.cpp
@@ -175,9 +175,9 @@ void BehaviorSettingsWidget::assignedStorageSettings(StorageSettings *storageSet
 void BehaviorSettingsWidget::updateConstrainTooltipsBoxTooltip() const
 {
     if (d->m_ui.constrainTooltipsBox->currentIndex() == 0)
-        d->m_ui.constrainTooltipsBox->setToolTip("Display context-sensitive help or type information on mouseover.");
+        d->m_ui.constrainTooltipsBox->setToolTip(tr("Display context-sensitive help or type information on mouseover."));
     else
-        d->m_ui.constrainTooltipsBox->setToolTip("Display context-sensitive help or type information on Shift+Mouseover.");
+        d->m_ui.constrainTooltipsBox->setToolTip(tr("Display context-sensitive help or type information on Shift+Mouseover."));
 }
 
 void BehaviorSettingsWidget::setAssignedBehaviorSettings(const BehaviorSettings &behaviorSettings)
diff --git a/src/plugins/texteditor/texteditor.pro b/src/plugins/texteditor/texteditor.pro
index 5840f6b61db748916ec5d0c57dfe92825d87c8d1..62e660c8747638e8d55c673f1fcbf05dfc3c1390 100644
--- a/src/plugins/texteditor/texteditor.pro
+++ b/src/plugins/texteditor/texteditor.pro
@@ -1,6 +1,6 @@
 TEMPLATE = lib
 TARGET = TextEditor
-DEFINES += TEXTEDITOR_LIBRARY
+DEFINES += TEXTEDITOR_LIBRARY QT_NO_CAST_FROM_ASCII
 QT += xml network
 CONFIG += exceptions
 greaterThan(QT_MAJOR_VERSION, 4): QT += printsupport
diff --git a/src/plugins/texteditor/texteditor.qbs b/src/plugins/texteditor/texteditor.qbs
index ef14c2500dc6a5ddafd7bcfe5897f85b11fa94f7..7e07864e0f6e96f8fa7e010960acbb65d4165ae3 100644
--- a/src/plugins/texteditor/texteditor.qbs
+++ b/src/plugins/texteditor/texteditor.qbs
@@ -11,6 +11,7 @@ QtcPlugin {
     Depends { name: "Find" }
     Depends { name: "Locator" }
 
+    cpp.defines: base.concat(["QT_NO_CAST_FROM_ASCII"])
     cpp.includePaths: base.concat([
         "generichighlighter",
         "tooltip",