feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger (qbs): Compile with QT_NO_CAST_FROM_ASCII

Browse Source 
Only comments were adapted

Change-Id: Id1393d512ed950ca747267c1e024d54e3bfc279d
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Orgad Shaneh
2012-11-26 20:43:43 +02:00
committed by hjk
parent eec1de885d
commit b7fea5fe53
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/debugger/debugger.qbs
View File

@@ -26,6 +26,7 @@ QtcPlugin {
"../../shared/json", "../../shared/json",
"../../shared/registryaccess" "../../shared/registryaccess"
]) ])
cpp.defines: base.concat(["QT_NO_CAST_FROM_ASCII"])
Group { Group {
condition: Defaults.testsEnabled(qbs) condition: Defaults.testsEnabled(qbs)

4
src/plugins/debugger/debuggerplugin.cpp
View File

@@ -1471,7 +1471,7 @@ bool DebuggerPluginPrivate::parseArgument(QStringList::const_iterator &it,
// a handshake when attaching to a crashed Windows process. // a handshake when attaching to a crashed Windows process.
// This is created by $QTC/src/tools/qtcdebugger/main.cpp: // This is created by $QTC/src/tools/qtcdebugger/main.cpp:
// args << QLatin1String("-wincrashevent") // args << QLatin1String("-wincrashevent")
// << QString("%1:%2").arg(argWinCrashEvent).arg(argProcessId); // << QString::fromLatin1("%1:%2").arg(argWinCrashEvent).arg(argProcessId);
if (*it == _("-wincrashevent")) { if (*it == _("-wincrashevent")) {
++it; ++it;
if (it == cend) { if (it == cend) {
@@ -2215,7 +2215,7 @@ void DebuggerPluginPrivate::updateState(DebuggerEngine *engine)
engine->watchHandler()->updateWatchersWindow(); engine->watchHandler()->updateWatchersWindow();
const DebuggerState state = engine->state(); const DebuggerState state = engine->state();
//showMessage(QString("PLUGIN SET STATE: ") //showMessage(QString::fromLatin1("PLUGIN SET STATE: ")
// + DebuggerEngine::stateName(state), LogStatus); // + DebuggerEngine::stateName(state), LogStatus);
//qDebug() << "PLUGIN SET STATE: " << state; //qDebug() << "PLUGIN SET STATE: " << state;

2
src/plugins/debugger/qml/qmlinspectoragent.cpp
View File

@@ -333,7 +333,7 @@ bool QmlInspectorAgent::addObjectWatch(int objectDebugId)
return true; return true;
// is flooding the debugging output log! // 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)) if (m_engineClient->addWatch(objectDebugId))
m_objectWatches.append(objectDebugId); m_objectWatches.append(objectDebugId);