Commit 65942d2d authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Orgad Shaneh

TextEditor: Compile with QT_NO_CAST_FROM_ASCII

Change-Id: If913f595de78dc8bc4eff1a5c3ad7fe8d5a623ae
Reviewed-by: default avatarFriedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: default avatarDavid Schulz <david.schulz@digia.com>
parent 387f5a70
......@@ -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")
......
......@@ -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)
......
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
......
......@@ -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",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment