diff --git a/src/libs/tracing/tracestashfile.h b/src/libs/tracing/tracestashfile.h index c3443e13001..0ab61050471 100644 --- a/src/libs/tracing/tracestashfile.h +++ b/src/libs/tracing/tracestashfile.h @@ -153,7 +153,7 @@ public: void clear() { file.remove(); - stream.unsetDevice(); + stream.setDevice(nullptr); } bool flush() diff --git a/src/plugins/android/androidrunnerworker.cpp b/src/plugins/android/androidrunnerworker.cpp index 29dc0a33098..565ac17bac1 100644 --- a/src/plugins/android/androidrunnerworker.cpp +++ b/src/plugins/android/androidrunnerworker.cpp @@ -676,7 +676,7 @@ void AndroidRunnerWorker::onProcessIdChanged(qint64 pid) QTC_ASSERT(m_psIsAlive, return); m_psIsAlive->setObjectName("IsAliveProcess"); m_psIsAlive->setProcessChannelMode(QProcess::MergedChannels); - connect(m_psIsAlive.get(), static_cast(&QProcess::finished), + connect(m_psIsAlive.get(), QOverload::of(&QProcess::finished), this, bind(&AndroidRunnerWorker::onProcessIdChanged, this, -1)); } } diff --git a/src/plugins/git/gerrit/gerritdialog.cpp b/src/plugins/git/gerrit/gerritdialog.cpp index f26df525fa9..0f7907f99f4 100644 --- a/src/plugins/git/gerrit/gerritdialog.cpp +++ b/src/plugins/git/gerrit/gerritdialog.cpp @@ -213,7 +213,7 @@ void GerritDialog::refresh() const QString &query = m_ui->queryLineEdit->text().trimmed(); updateCompletions(query); m_model->refresh(m_server, query); - m_ui->treeView->sortByColumn(-1); + m_ui->treeView->sortByColumn(-1, Qt::DescendingOrder); } void GerritDialog::scheduleUpdateRemotes() diff --git a/src/plugins/valgrind/callgrindtool.cpp b/src/plugins/valgrind/callgrindtool.cpp index ab018d98286..88a63149505 100644 --- a/src/plugins/valgrind/callgrindtool.cpp +++ b/src/plugins/valgrind/callgrindtool.cpp @@ -323,7 +323,7 @@ CallgrindTool::CallgrindTool() m_callersView->setObjectName("Valgrind.CallgrindTool.CallersView"); m_callersView->setWindowTitle(tr("Callers")); m_callersView->setSettings(coreSettings, "Valgrind.CallgrindTool.CallersView"); - m_callersView->sortByColumn(CallModel::CostColumn); + m_callersView->sortByColumn(CallModel::CostColumn, Qt::DescendingOrder); m_callersView->setFrameStyle(QFrame::NoFrame); // enable sorting m_callersProxy.setSourceModel(&m_callersModel); @@ -336,7 +336,7 @@ CallgrindTool::CallgrindTool() m_calleesView->setObjectName("Valgrind.CallgrindTool.CalleesView"); m_calleesView->setWindowTitle(tr("Callees")); m_calleesView->setSettings(coreSettings, "Valgrind.CallgrindTool.CalleesView"); - m_calleesView->sortByColumn(CallModel::CostColumn); + m_calleesView->sortByColumn(CallModel::CostColumn, Qt::DescendingOrder); m_calleesView->setFrameStyle(QFrame::NoFrame); // enable sorting m_calleesProxy.setSourceModel(&m_calleesModel); @@ -349,7 +349,7 @@ CallgrindTool::CallgrindTool() m_flatView->setObjectName("Valgrind.CallgrindTool.FlatView"); m_flatView->setWindowTitle(tr("Functions")); m_flatView->setSettings(coreSettings, "Valgrind.CallgrindTool.FlatView"); - m_flatView->sortByColumn(DataModel::SelfCostColumn); + m_flatView->sortByColumn(DataModel::SelfCostColumn, Qt::DescendingOrder); m_flatView->setFrameStyle(QFrame::NoFrame); m_flatView->setAttribute(Qt::WA_MacShowFocusRect, false); m_flatView->setModel(&m_proxyModel);