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

PerfProfiler: Some compile fixes with Qt6

Browse Source 
Task-number: QTCREATORBUG-24098
Change-Id: I9d3260034051dd15e7d5892e3300f5f719bdf5ca
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
hjk
2020-08-20 10:45:06 +02:00
parent 0cdd07e06e
commit c6818c62f1
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/perfprofiler/perfdatareader.cpp
View File

@@ -408,7 +408,7 @@ QString PerfDataReader::findPerfParser()
QString filePath = QString::fromLocal8Bit(qgetenv("PERFPROFILER_PARSER_FILEPATH")); QString filePath = QString::fromLocal8Bit(qgetenv("PERFPROFILER_PARSER_FILEPATH"));
if (filePath.isEmpty()) { if (filePath.isEmpty()) {
filePath = QString::fromLatin1("%1/perfparser%2").arg(Core::ICore::libexecPath(), filePath = QString::fromLatin1("%1/perfparser%2").arg(Core::ICore::libexecPath(),
QTC_HOST_EXE_SUFFIX); QString(QTC_HOST_EXE_SUFFIX));
} }
return QDir::toNativeSeparators(QDir::cleanPath(filePath)); return QDir::toNativeSeparators(QDir::cleanPath(filePath));
} }

2
src/plugins/perfprofiler/perftimelinemodel.cpp
View File

@@ -518,7 +518,7 @@ void PerfTimelineModel::finalize()
m_locationOrder.resize(m_locationStats.size()); m_locationOrder.resize(m_locationStats.size());
QMultiHash<int, LocationStats>::ConstIterator iter = m_locationStats.constBegin(); QHash<int, LocationStats>::ConstIterator iter = m_locationStats.constBegin();
int i = 0; int i = 0;
for (; iter != m_locationStats.constEnd(); ++iter) for (; iter != m_locationStats.constEnd(); ++iter)
m_locationOrder[i++] = iter.key(); m_locationOrder[i++] = iter.key();

4
src/plugins/perfprofiler/tests/perfresourcecounter_test.cpp
View File

@@ -62,14 +62,14 @@ template<typename Counter>
static void fill(Counter &counter, const typename Counter::Container &container, bool fragmented) static void fill(Counter &counter, const typename Counter::Container &container, bool fragmented)
{ {
qint64 allocated = 0; qint64 allocated = 0;
QHash<void *, int> allocations; QMultiHash<void *, int> allocations;
for (int i = 0; i < 100; ++i) { for (int i = 0; i < 100; ++i) {
for (int j = 0; j < 100; ++j) { for (int j = 0; j < 100; ++j) {
int amount = fragmented ? j : i; int amount = fragmented ? j : i;
allocated += amount; allocated += amount;
counter.request(amount); counter.request(amount);
void *alloc = malloc(amount); void *alloc = malloc(amount);
allocations.insertMulti(alloc, amount); allocations.insert(alloc, amount);
counter.obtain(reinterpret_cast<quintptr>(alloc)); counter.obtain(reinterpret_cast<quintptr>(alloc));
QCOMPARE(counter.currentTotal(), allocated); QCOMPARE(counter.currentTotal(), allocated);
} }