diff --git a/src/plugins/debugger/cdb/cdbdebugengine.cpp b/src/plugins/debugger/cdb/cdbdebugengine.cpp index b538b7fe67578706753db8da04fe9736c42b154f..9f74ec7f9ef1f91f9f6df87f8632db11e0ab8f0d 100644 --- a/src/plugins/debugger/cdb/cdbdebugengine.cpp +++ b/src/plugins/debugger/cdb/cdbdebugengine.cpp @@ -655,7 +655,7 @@ void CdbDebugEngine::startDebugger(const QSharedPointer<DebuggerStartParameters> m_d->m_dumper->reset(dumperLibName, dumperEnabled); setState(InferiorStarting, Q_FUNC_INFO, __LINE__); - manager()->showStatusMessage("Starting Debugger", -1); + manager()->showStatusMessage("Starting Debugger", messageTimeOut); QString errorMessage; bool rc = false; @@ -692,7 +692,6 @@ void CdbDebugEngine::startDebugger(const QSharedPointer<DebuggerStartParameters> break; } if (rc) { - manager()->showStatusMessage(tr("Debugger running"), -1); if (needWatchTimer) startWatchTimer(); emit startSuccessful(); @@ -732,8 +731,6 @@ bool CdbDebugEngine::startAttachDebugger(qint64 pid, DebuggerStartMode sm, QStri bool CdbDebugEngine::startDebuggerWithExecutable(DebuggerStartMode sm, QString *errorMessage) { - showStatusMessage("Starting Debugger", -1); - DEBUG_CREATE_PROCESS_OPTIONS dbgopts; memset(&dbgopts, 0, sizeof(dbgopts)); dbgopts.CreateFlags = DEBUG_PROCESS | DEBUG_ONLY_THIS_PROCESS; @@ -1190,7 +1187,7 @@ bool CdbDebugEnginePrivate::continueInferior(QString *errorMessage) setCodeLevel(); m_engine->killWatchTimer(); manager()->resetLocation(); - manager()->showStatusMessage(CdbDebugEngine::tr("Running requested..."), 5000); + manager()->showStatusMessage(CdbDebugEngine::tr("Running requested..."), messageTimeOut); if (!continueInferiorProcess(errorMessage)) break; diff --git a/src/plugins/debugger/cdb/cdbdebugengine_p.h b/src/plugins/debugger/cdb/cdbdebugengine_p.h index 31df174b072b136f2322580ace3d2ead97872c3b..89a7fa15f74fbf3c64c60331da1baf54e7a19c8c 100644 --- a/src/plugins/debugger/cdb/cdbdebugengine_p.h +++ b/src/plugins/debugger/cdb/cdbdebugengine_p.h @@ -194,6 +194,8 @@ const char *executionStatusString(CIDebugControl *ctl); QString msgDebugEngineComResult(HRESULT hr); QString msgComFailed(const char *func, HRESULT hr); +enum { messageTimeOut = 5000 }; + enum { debugCDB = 0 }; enum { debugCDBExecution = 0 }; enum { debugCDBWatchHandling = 0 }; diff --git a/src/plugins/debugger/cdb/cdbdumperhelper.cpp b/src/plugins/debugger/cdb/cdbdumperhelper.cpp index 2269aab42cdcd906244ebb1db94727f52ef6cec0..2ebac2710fd0fe024148d01d4eee5a3069d6eba9 100644 --- a/src/plugins/debugger/cdb/cdbdumperhelper.cpp +++ b/src/plugins/debugger/cdb/cdbdumperhelper.cpp @@ -288,13 +288,13 @@ bool CdbDumperInitThread::ensureDumperInitialized(CdbDumperHelper &h, QString *e eventLoop.exec(QEventLoop::ExcludeUserInputEvents); QApplication::restoreOverrideCursor(); if (thread.m_ok) { - h.m_manager->showStatusMessage(QCoreApplication::translate("Debugger::Internal::CdbDumperHelper", "Stopped / Custom dumper library initialized."), -1); + h.m_manager->showStatusMessage(QCoreApplication::translate("Debugger::Internal::CdbDumperHelper", "Stopped / Custom dumper library initialized."), messageTimeOut); h.m_manager->showDebuggerOutput(LogMisc, h.m_helper.toString()); h.m_state = CdbDumperHelper::Initialized; } else { h.m_state = CdbDumperHelper::Disabled; // No message here *errorMessage = QCoreApplication::translate("Debugger::Internal::CdbDumperHelper", "The custom dumper library could not be initialized: %1").arg(*errorMessage); - h.m_manager->showStatusMessage(*errorMessage, -1); + h.m_manager->showStatusMessage(*errorMessage, messageTimeOut); h.m_manager->showQtDumperLibraryWarning(*errorMessage); } if (loadDebug) @@ -332,7 +332,7 @@ void CdbDumperInitThread ::run() break; } // Perform remaining initialization - emit statusMessage(QCoreApplication::translate("Debugger::Internal::CdbDumperHelper", "Initializing dumpers..."), -1); + emit statusMessage(QCoreApplication::translate("Debugger::Internal::CdbDumperHelper", "Initializing dumpers..."), 60000); m_ok = m_helper.initResolveSymbols(m_errorMessage) && m_helper.initKnownTypes(m_errorMessage); } @@ -404,7 +404,7 @@ void CdbDumperHelper::moduleLoadHook(const QString &module, HANDLE debuggeeHandl // for the thread to finish as this would lock up. if (m_tryInjectLoad && module.contains(QLatin1String("Qt"), Qt::CaseInsensitive)) { // Also shows up in the log window. - m_manager->showStatusMessage(msgLoading(m_library, true), 10000); + m_manager->showStatusMessage(msgLoading(m_library, true), messageTimeOut); QString errorMessage; SharedLibraryInjector sh(GetProcessId(debuggeeHandle)); if (sh.remoteInject(m_library, false, &errorMessage)) {