diff --git a/src/plugins/debugger/debugger.qbs b/src/plugins/debugger/debugger.qbs index 3548700b3f7..5a22105ea7a 100644 --- a/src/plugins/debugger/debugger.qbs +++ b/src/plugins/debugger/debugger.qbs @@ -26,6 +26,7 @@ QtcPlugin { "../../shared/json", "../../shared/registryaccess" ]) + cpp.defines: base.concat(["QT_NO_CAST_FROM_ASCII"]) Group { condition: Defaults.testsEnabled(qbs) diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index bbd6b33bdc3..371c7f4d492 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -1471,7 +1471,7 @@ bool DebuggerPluginPrivate::parseArgument(QStringList::const_iterator &it, // a handshake when attaching to a crashed Windows process. // This is created by $QTC/src/tools/qtcdebugger/main.cpp: // args << QLatin1String("-wincrashevent") - // << QString("%1:%2").arg(argWinCrashEvent).arg(argProcessId); + // << QString::fromLatin1("%1:%2").arg(argWinCrashEvent).arg(argProcessId); if (*it == _("-wincrashevent")) { ++it; if (it == cend) { @@ -2215,7 +2215,7 @@ void DebuggerPluginPrivate::updateState(DebuggerEngine *engine) engine->watchHandler()->updateWatchersWindow(); const DebuggerState state = engine->state(); - //showMessage(QString("PLUGIN SET STATE: ") + //showMessage(QString::fromLatin1("PLUGIN SET STATE: ") // + DebuggerEngine::stateName(state), LogStatus); //qDebug() << "PLUGIN SET STATE: " << state; diff --git a/src/plugins/debugger/qml/qmlinspectoragent.cpp b/src/plugins/debugger/qml/qmlinspectoragent.cpp index 1573a9cdb0b..cafbe8d243a 100644 --- a/src/plugins/debugger/qml/qmlinspectoragent.cpp +++ b/src/plugins/debugger/qml/qmlinspectoragent.cpp @@ -333,7 +333,7 @@ bool QmlInspectorAgent::addObjectWatch(int objectDebugId) return true; // is flooding the debugging output log! - // log(LogSend, QString("WATCH_PROPERTY %1").arg(objectDebugId)); + // log(LogSend, QString::fromLatin1("WATCH_PROPERTY %1").arg(objectDebugId)); if (m_engineClient->addWatch(objectDebugId)) m_objectWatches.append(objectDebugId);