diff --git a/share/qtcreator/gdbmacros/gdbmacros.cpp b/share/qtcreator/gdbmacros/gdbmacros.cpp
index 11f83c65c907176fa7d800c769c5089181b52b10..bbc6862202fb4908dacd462b89ccb7b7e67a375e 100644
--- a/share/qtcreator/gdbmacros/gdbmacros.cpp
+++ b/share/qtcreator/gdbmacros/gdbmacros.cpp
@@ -632,8 +632,8 @@ QDumper &QDumper::put(const void *p)
{
if (p) {
// Pointer is 'long long' on WIN_64, only
- static const char *printFormat = sizeof(quintptr) == sizeof(long) ? "0x%lx" : "0x%llx";
- pos += sprintf(outBuffer + pos, printFormat, reinterpret_cast<quintptr>(p));
+ static const char *printFormat = sizeof(void *) == sizeof(long) ? "0x%lx" : "0x%llx";
+ pos += sprintf(outBuffer + pos, printFormat, p);
} else {
pos += sprintf(outBuffer + pos, "<null>");
}
@@ -1066,10 +1066,9 @@ static void qDumpQAbstractItem(QDumper &d)
ModelIndex *mm = reinterpret_cast<ModelIndex *>(&mi);
mm->r = mm->c = 0;
mm->p = mm->m = 0;
- static const char *printFormat = sizeof(quintptr) == sizeof(long) ?
+ static const char *printFormat = sizeof(void *) == sizeof(long) ?
"%d,%d,0x%lx,0x%lx" : "%d,%d,0x%llx,0x%llx";
- sscanf(d.templateParameters[0], printFormat, &mm->r, &mm->c,
- reinterpret_cast<quintptr*>(&mm->p), reinterpret_cast<quintptr*>(&mm->m));
+ sscanf(d.templateParameters[0], printFormat, &mm->r, &mm->c, &mm->p, &mm->m);
}
const QAbstractItemModel *m = mi.model();
const int rowCount = m->rowCount(mi);
@@ -2146,10 +2145,10 @@ static void qDumpQVariantHelper(const QVariant *v, QString *value,
break;
#endif
default: {
- static const char *qTypeFormat = sizeof(quintptr) == sizeof(long) ?
+ static const char *qTypeFormat = sizeof(void *) == sizeof(long) ?
"'"NS"%s "NS"qVariantValue<"NS"%s >'(*('"NS"QVariant'*)0x%lx)" :
"'"NS"%s "NS"qVariantValue<"NS"%s >'(*('"NS"QVariant'*)0x%llx)";
- static const char *nonQTypeFormat = sizeof(quintptr) == sizeof(long) ?
+ static const char *nonQTypeFormat = sizeof(void *) == sizeof(long) ?
"'%s "NS"qVariantValue<%s >'(*('"NS"QVariant'*)0x%lx)" :
"'%s "NS"qVariantValue<%s >'(*('"NS"QVariant'*)0x%llx)";
char buf[1000];
diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts
index fa61bcbb885060c2a5c30d84fb275554fb356902..6768a4e2b0e3dd023cb9e9364ad97c0117373470 100644
--- a/share/qtcreator/translations/qtcreator_de.ts
+++ b/share/qtcreator/translations/qtcreator_de.ts
@@ -11815,7 +11815,7 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<message>
<location line="+12"/>
<source>Use debug version of frameworks (DYLD_IMAGE_SUFFIX=_debug)</source>
- <translation>Debug-Version des Frameworks verwenden (DYLD_IMAGE_SUFFIX=_debug)</translation>
+ <translation>Debug-Version von Frameworks verwenden (DYLD_IMAGE_SUFFIX=_debug)</translation>
</message>
</context>
<context>
diff --git a/src/plugins/debugger/gdb/attachgdbadapter.cpp b/src/plugins/debugger/gdb/attachgdbadapter.cpp
index 4c0968233f2217269e3a4c28d2d0f5ac1bd64195..0f6b50b6bd79b88645f4399023365663be703983 100644
--- a/src/plugins/debugger/gdb/attachgdbadapter.cpp
+++ b/src/plugins/debugger/gdb/attachgdbadapter.cpp
@@ -77,17 +77,9 @@ void AttachGdbAdapter::startInferior()
void AttachGdbAdapter::handleAttach(const GdbResponse &response)
{
+ QTC_ASSERT(state() == InferiorStarting, qDebug() << state());
if (response.resultClass == GdbResultDone) {
- // We don't know the exact 6.8.50 build where gdb started emitting
- // *stopped here, so allow for some slack.
- if (m_engine->m_gdbVersion < 60850) {
- QTC_ASSERT(state() == InferiorStarting, qDebug() << state());
- setState(InferiorStopped);
- } else if (m_engine->m_gdbVersion < 70000 && state() == InferiorStarting) {
- setState(InferiorStopped);
- } else {
- QTC_ASSERT(state() == InferiorStopped, qDebug() << state());
- }
+ setState(InferiorStopped);
debugMessage(_("INFERIOR ATTACHED"));
showStatusMessage(msgAttachedToStoppedInferior());
emit inferiorPrepared();
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index fcaac3ab3f9bee494db697be217ba7e77d8f2620..b16ad59c9b1e58c881893639d1710278233a4989 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -285,6 +285,9 @@ void GdbEngine::initializeVariables()
m_currentFunctionArgs.clear();
m_currentFrame.clear();
m_dumperHelper.clear();
+#ifdef Q_OS_LINUX
+ m_entryPoint.clear();
+#endif
}
QString GdbEngine::errorMessage(QProcess::ProcessError error)
@@ -889,6 +892,7 @@ void GdbEngine::updateAll()
{
QTC_ASSERT(state() == InferiorUnrunnable || state() == InferiorStopped, /**/);
tryLoadDebuggingHelpers();
+ reloadModulesInternal();
postCommand(_("-stack-list-frames"), WatchUpdate, CB(handleStackListFrames),
QVariant::fromValue<StackCookie>(StackCookie(false, true)));
manager()->stackHandler()->setCurrentIndex(0);
@@ -1017,6 +1021,11 @@ void GdbEngine::handleAqcuiredInferior()
void GdbEngine::handleStopResponse(const GdbMi &data)
{
+ // This is gdb 7+'s initial *stopped in response to attach.
+ // For consistency, we just discard it.
+ if (state() == InferiorStarting)
+ return;
+
const QByteArray reason = data.findChild("reason").data();
if (isExitedReason(reason)) {
@@ -1059,31 +1068,30 @@ void GdbEngine::handleStopResponse(const GdbMi &data)
return;
}
- bool initHelpers = true;
if (state() == InferiorRunning) {
// Stop triggered by a breakpoint or otherwise not directly
// initiated by the user.
setState(InferiorStopping);
} else {
- if (state() == InferiorStarting)
- initHelpers = false;
- else
- QTC_ASSERT(state() == InferiorStopping, qDebug() << state());
+ QTC_ASSERT(state() == InferiorStopping, qDebug() << state());
}
setState(InferiorStopped);
#ifdef Q_OS_LINUX
// For some reason, attaching to a stopped process causes *two* stops
- // when trying to continue (kernel 2.6.24-23-ubuntu).
+ // when trying to continue (kernel i386 2.6.24-23-ubuntu, gdb 6.8).
// Interestingly enough, on MacOSX no signal is delivered at all.
- if (reason == "signal-received"
- && data.findChild("signal-name").data() == "SIGSTOP") {
- GdbMi frameData = data.findChild("frame");
- if (frameData.findChild("func").data() == "_start"
- && frameData.findChild("from").data() == "/lib/ld-linux.so.2") {
- continueInferiorInternal();
- return;
+ if (!m_entryPoint.isEmpty()) {
+ if (reason == "signal-received"
+ && data.findChild("signal-name").data() == "SIGSTOP") {
+ GdbMi frameData = data.findChild("frame");
+ if (frameData.findChild("addr").data() == m_entryPoint) {
+ continueInferiorInternal();
+ return;
+ }
}
+ // We are past the initial stops. No need to waste time on further checks.
+ m_entryPoint.clear();
}
#endif
@@ -1146,8 +1154,7 @@ void GdbEngine::handleStopResponse(const GdbMi &data)
}
}
- if (initHelpers && m_debuggingHelperState != DebuggingHelperUninitialized)
- initHelpers = false;
+ bool initHelpers = (m_debuggingHelperState == DebuggingHelperUninitialized);
// Don't load helpers on stops triggered by signals unless it's
// an intentional trap.
if (initHelpers && reason == "signal-received") {
@@ -1333,16 +1340,12 @@ QString GdbEngine::fullName(const QString &fileName)
QString GdbEngine::cleanupFullName(const QString &fileName)
{
QTC_ASSERT(!fileName.isEmpty(), return QString())
- if (m_gdbVersion < 60800) {
- // The symbian gdb 6.4 seems to deliver "fullnames" which
- // a) have no drive letter and b) are not normalized.
- QFileInfo fi(fileName);
- if (!fi.isReadable())
- return QString();
- return QDir::cleanPath(fi.absoluteFilePath());
- } else {
- return fileName;
- }
+ // Gdb on windows often delivers "fullnames" which
+ // a) have no drive letter and b) are not normalized.
+ QFileInfo fi(fileName);
+ if (!fi.isReadable())
+ return QString();
+ return QDir::cleanPath(fi.absoluteFilePath());
}
#endif
@@ -2271,9 +2274,11 @@ StackFrame GdbEngine::parseStackFrame(const GdbMi &frameMi, int level)
//qDebug() << "HANDLING FRAME:" << frameMi.toString();
StackFrame frame;
frame.level = level;
- // We might want to fall back to "file" once we have a mapping which
- // is more complete than gdb's own ...
- frame.file = cleanupFullName(QFile::decodeName(frameMi.findChild("fullname").data()));
+ GdbMi fullName = frameMi.findChild("fullname");
+ if (fullName.isValid())
+ frame.file = cleanupFullName(QFile::decodeName(fullName.data()));
+ else
+ frame.file = QFile::decodeName(frameMi.findChild("file").data());
frame.function = _(frameMi.findChild("func").data());
frame.from = _(frameMi.findChild("from").data());
frame.line = frameMi.findChild("line").data().toInt();
@@ -2327,8 +2332,7 @@ void GdbEngine::handleStackListFrames(const GdbResponse &response)
#endif
// Initialize top frame to the first valid frame.
- // FIXME: Check for QFile(frame.fullname).isReadable()?
- const bool isValid = !frame.file.isEmpty() && !frame.function.isEmpty();
+ const bool isValid = frame.isUsable() && !frame.function.isEmpty();
if (isValid && targetFrame == -1)
targetFrame = i;
}
diff --git a/src/plugins/debugger/gdb/gdbengine.h b/src/plugins/debugger/gdb/gdbengine.h
index 1229cc17d9d759a862a4f33d6cbe3e7592a4f09c..2636d16c8dd69bfd637cfc8d04a8cb563ebd3b8a 100644
--- a/src/plugins/debugger/gdb/gdbengine.h
+++ b/src/plugins/debugger/gdb/gdbengine.h
@@ -294,6 +294,10 @@ private: ////////// Inferior Management //////////
void handleInferiorPidChanged(qint64 pid) { manager()->notifyInferiorPidChanged(pid); }
void maybeHandleInferiorPidChanged(const QString &pid);
+#ifdef Q_OS_LINUX
+ QByteArray m_entryPoint;
+#endif
+
private: ////////// View & Data Stuff //////////
virtual void selectThread(int index);
diff --git a/src/plugins/debugger/gdb/remotegdbadapter.cpp b/src/plugins/debugger/gdb/remotegdbadapter.cpp
index bf255592a6c4f9183ea4f78e206ea4ef8003cf35..7edbc9e746d2dbea434a19dde1123576ce53ee6b 100644
--- a/src/plugins/debugger/gdb/remotegdbadapter.cpp
+++ b/src/plugins/debugger/gdb/remotegdbadapter.cpp
@@ -182,8 +182,9 @@ void RemoteGdbAdapter::handleFileExecAndSymbols(const GdbResponse &response)
void RemoteGdbAdapter::handleTargetRemote(const GdbResponse &record)
{
+ QTC_ASSERT(state() == InferiorStarting, qDebug() << state());
if (record.resultClass == GdbResultDone) {
- QTC_ASSERT(state() == InferiorStopped, qDebug() << state());
+ setState(InferiorStopped);
// gdb server will stop the remote application itself.
debugMessage(_("INFERIOR STARTED"));
showStatusMessage(msgAttachedToStoppedInferior());
diff --git a/src/plugins/debugger/gdb/termgdbadapter.cpp b/src/plugins/debugger/gdb/termgdbadapter.cpp
index fbdc6a6dd84c3ab8d885f46d636efa893e052deb..b369dad4c6d8d92597686f0f841c528013981188 100644
--- a/src/plugins/debugger/gdb/termgdbadapter.cpp
+++ b/src/plugins/debugger/gdb/termgdbadapter.cpp
@@ -114,10 +114,14 @@ void TermGdbAdapter::startInferior()
void TermGdbAdapter::handleStubAttached(const GdbResponse &response)
{
+ QTC_ASSERT(state() == InferiorStarting, qDebug() << state());
if (response.resultClass == GdbResultDone) {
- QTC_ASSERT(state() == InferiorStopped, qDebug() << state());
+ setState(InferiorStopped);
debugMessage(_("INFERIOR ATTACHED"));
emit inferiorPrepared();
+#ifdef Q_OS_LINUX
+ m_engine->postCommand(_("-stack-list-frames 0 0"), CB(handleEntryPoint));
+#endif
} else if (response.resultClass == GdbResultError) {
QString msg = _(response.data.findChild("msg").data());
emit inferiorStartFailed(msg);
@@ -129,6 +133,17 @@ void TermGdbAdapter::startInferiorPhase2()
m_engine->continueInferiorInternal();
}
+#ifdef Q_OS_LINUX
+void TermGdbAdapter::handleEntryPoint(const GdbResponse &response)
+{
+ if (response.resultClass == GdbResultDone) {
+ GdbMi stack = response.data.findChild("stack");
+ if (stack.isValid() && stack.childCount() == 1)
+ m_engine->m_entryPoint = stack.childAt(0).findChild("addr").data();
+ }
+}
+#endif
+
void TermGdbAdapter::interruptInferior()
{
const qint64 attachedPID = m_engine->inferiorPid();
diff --git a/src/plugins/debugger/gdb/termgdbadapter.h b/src/plugins/debugger/gdb/termgdbadapter.h
index 11fb04a2c4cb03b9918fa934f36094377fc55fa6..1b98eed9874bc906b09d7829a2267afb117a3056 100644
--- a/src/plugins/debugger/gdb/termgdbadapter.h
+++ b/src/plugins/debugger/gdb/termgdbadapter.h
@@ -60,6 +60,9 @@ public:
private:
void handleStubAttached(const GdbResponse &response);
+#ifdef Q_OS_LINUX
+ void handleEntryPoint(const GdbResponse &response);
+#endif
Q_SLOT void handleInferiorStarted();
Q_SLOT void stubExited();
diff --git a/src/plugins/debugger/gdb/trkgdbadapter.cpp b/src/plugins/debugger/gdb/trkgdbadapter.cpp
index 82ce54376bd0bd6b5a97186a106b01db24d60539..dcbe2851eea1998159ed0160c988e0bbdf3b22dd 100644
--- a/src/plugins/debugger/gdb/trkgdbadapter.cpp
+++ b/src/plugins/debugger/gdb/trkgdbadapter.cpp
@@ -1616,6 +1616,7 @@ void TrkGdbAdapter::handleTargetRemote(const GdbResponse &record)
{
QTC_ASSERT(state() == InferiorStarting, qDebug() << state());
if (record.resultClass == GdbResultDone) {
+ setState(InferiorStopped);
emit inferiorPrepared();
} else {
QString msg = tr("Connecting to TRK server adapter failed:\n")
diff --git a/src/plugins/debugger/stackhandler.cpp b/src/plugins/debugger/stackhandler.cpp
index fa6b972e555d87356cb49a015875f7988c48923a..d2b146b91349b1a4613781b033965f0ba183343a 100644
--- a/src/plugins/debugger/stackhandler.cpp
+++ b/src/plugins/debugger/stackhandler.cpp
@@ -203,7 +203,7 @@ Qt::ItemFlags StackHandler::flags(const QModelIndex &index) const
if (index.row() == m_stackFrames.size())
return QAbstractTableModel::flags(index);
const StackFrame &frame = m_stackFrames.at(index.row());
- const bool isValid = (!frame.file.isEmpty() && !frame.function.isEmpty())
+ const bool isValid = (frame.isUsable() && !frame.function.isEmpty())
|| theDebuggerBoolSetting(OperateByInstruction);
return isValid ? QAbstractTableModel::flags(index) : Qt::ItemFlags(0);
}
diff --git a/src/plugins/vcsbase/checkoutjobs.cpp b/src/plugins/vcsbase/checkoutjobs.cpp
index 7a419a009829a9166e2b2e679d4b64a4f9e38bd9..257068d5b50158d00b310c695ff9b510be019f6f 100644
--- a/src/plugins/vcsbase/checkoutjobs.cpp
+++ b/src/plugins/vcsbase/checkoutjobs.cpp
@@ -94,9 +94,16 @@ void ProcessCheckoutJob::slotOutput()
emit output(s);
}
-void ProcessCheckoutJob::slotError(QProcess::ProcessError /* error */)
+void ProcessCheckoutJob::slotError(QProcess::ProcessError error)
{
- emit failed(d->process.errorString());
+ switch (error) {
+ case QProcess::FailedToStart:
+ emit failed(tr("Unable to start %1: %2").arg(d->binary, d->process.errorString()));
+ break;
+ default:
+ emit failed(d->process.errorString());
+ break;
+ }
}
void ProcessCheckoutJob::slotFinished (int exitCode, QProcess::ExitStatus exitStatus)
diff --git a/src/plugins/vcsbase/checkoutprogresswizardpage.cpp b/src/plugins/vcsbase/checkoutprogresswizardpage.cpp
index 6af15fb0f8b90478c14206d1ce91f86fd98e171c..8fcaef51fc3db364744a548cf7a8548553e0f11b 100644
--- a/src/plugins/vcsbase/checkoutprogresswizardpage.cpp
+++ b/src/plugins/vcsbase/checkoutprogresswizardpage.cpp
@@ -63,10 +63,11 @@ void CheckoutProgressWizardPage::start(const QSharedPointer<AbstractCheckoutJob>
connect(job.data(), SIGNAL(succeeded()), this, SLOT(slotSucceeded()));
QApplication::setOverrideCursor(Qt::WaitCursor);
ui->logPlainTextEdit->clear();
- setSubTitle(tr("Checkout started..."));
- job->start();
+ setSubTitle(tr("Checkout started..."));
m_state = Running;
-
+ // Note: Process jobs can emit failed() right from
+ // the start() method on Windows.
+ job->start();
}
void CheckoutProgressWizardPage::slotFailed(const QString &why)
diff --git a/src/plugins/vcsbase/checkoutwizarddialog.cpp b/src/plugins/vcsbase/checkoutwizarddialog.cpp
index 9cb5a6a45e85a4420a7a940c56e015bfbd597d31..36b9c271ee02e1af7efc06320acfb7195e845c6a 100644
--- a/src/plugins/vcsbase/checkoutwizarddialog.cpp
+++ b/src/plugins/vcsbase/checkoutwizarddialog.cpp
@@ -70,9 +70,9 @@ void CheckoutWizardDialog::slotTerminated(bool success)
void CheckoutWizardDialog::start(const QSharedPointer<AbstractCheckoutJob> &job)
{
- m_progressPage->start(job);
// No "back" available while running.
button(QWizard::BackButton)->setEnabled(false);
+ m_progressPage->start(job);
}
void CheckoutWizardDialog::reject()
diff --git a/src/tools/qtcdebugger/qtcdebugger.pro b/src/tools/qtcdebugger/qtcdebugger.pro
index f336112edc6ede34d6a12073be381a930852f733..3ebed68e697850003af379986853007ced6370a1 100644
--- a/src/tools/qtcdebugger/qtcdebugger.pro
+++ b/src/tools/qtcdebugger/qtcdebugger.pro
@@ -1,6 +1,5 @@
TARGET = qtcdebugger
TEMPLATE = app
-CONFIG += console
SOURCES += main.cpp
LIBS *= -lpsapi