Skip to content

Commit 8896651

Browse files
Robin BurchellThe Qt Project
authored andcommitted
Remove QPerformanceTimer now that QElapsedTimer contains the necessary bits
QPerformanceTimer was a copy of QElapsedTimer with some additional functionality which has since been subsumed into QElapsedTimer, so remove the forked code. (backport of cd6ebb4912a5d96c788ea0c838d8a1a06ff4029e from qtdeclarative) (backport of d733f6a942e40e58ebc09f1d4414e2f8fa3f6a28 from qtquick1) Change-Id: I261f0e957ffe3fc5fe42cd50672d2dd99b080f1e Reviewed-by: Christopher Adams <[email protected]> Reviewed-by: Alan Alpert <[email protected]>
1 parent 68331c5 commit 8896651

File tree

10 files changed

+13
-554
lines changed

10 files changed

+13
-554
lines changed

src/declarative/debugger/qdeclarativedebugtrace.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ Q_GLOBAL_STATIC(QDeclarativeDebugTrace, traceInstance);
109109

110110
// convert to a QByteArray that can be sent to the debug client
111111
// use of QDataStream can skew results if m_deferredSend == false
112-
// (see tst_qperformancetimer::trace() benchmark)
112+
// (see tst_qdeclarativedebugtrace::trace() benchmark)
113113
QByteArray QDeclarativeDebugData::toByteArray() const
114114
{
115115
QByteArray data;
@@ -182,7 +182,7 @@ void QDeclarativeDebugTrace::addEventImpl(EventType event)
182182
if (status() != Enabled || !m_enabled)
183183
return;
184184

185-
QDeclarativeDebugData ed = {m_timer.elapsed(), (int)Event, (int)event, QString(), -1};
185+
QDeclarativeDebugData ed = {m_timer.nsecsElapsed(), (int)Event, (int)event, QString(), -1};
186186
processMessage(ed);
187187
}
188188

@@ -191,7 +191,7 @@ void QDeclarativeDebugTrace::startRangeImpl(RangeType range)
191191
if (status() != Enabled || !m_enabled)
192192
return;
193193

194-
QDeclarativeDebugData rd = {m_timer.elapsed(), (int)RangeStart, (int)range, QString(), -1};
194+
QDeclarativeDebugData rd = {m_timer.nsecsElapsed(), (int)RangeStart, (int)range, QString(), -1};
195195
processMessage(rd);
196196
}
197197

@@ -200,7 +200,7 @@ void QDeclarativeDebugTrace::rangeDataImpl(RangeType range, const QString &rData
200200
if (status() != Enabled || !m_enabled)
201201
return;
202202

203-
QDeclarativeDebugData rd = {m_timer.elapsed(), (int)RangeData, (int)range, rData, -1};
203+
QDeclarativeDebugData rd = {m_timer.nsecsElapsed(), (int)RangeData, (int)range, rData, -1};
204204
processMessage(rd);
205205
}
206206

@@ -209,7 +209,7 @@ void QDeclarativeDebugTrace::rangeDataImpl(RangeType range, const QUrl &rData)
209209
if (status() != Enabled || !m_enabled)
210210
return;
211211

212-
QDeclarativeDebugData rd = {m_timer.elapsed(), (int)RangeData, (int)range, rData.toString(QUrl::FormattingOption(0x100)), -1};
212+
QDeclarativeDebugData rd = {m_timer.nsecsElapsed(), (int)RangeData, (int)range, rData.toString(QUrl::FormattingOption(0x100)), -1};
213213
processMessage(rd);
214214
}
215215

@@ -218,7 +218,7 @@ void QDeclarativeDebugTrace::rangeLocationImpl(RangeType range, const QString &f
218218
if (status() != Enabled || !m_enabled)
219219
return;
220220

221-
QDeclarativeDebugData rd = {m_timer.elapsed(), (int)RangeLocation, (int)range, fileName, line};
221+
QDeclarativeDebugData rd = {m_timer.nsecsElapsed(), (int)RangeLocation, (int)range, fileName, line};
222222
processMessage(rd);
223223
}
224224

@@ -227,7 +227,7 @@ void QDeclarativeDebugTrace::rangeLocationImpl(RangeType range, const QUrl &file
227227
if (status() != Enabled || !m_enabled)
228228
return;
229229

230-
QDeclarativeDebugData rd = {m_timer.elapsed(), (int)RangeLocation, (int)range, fileName.toString(QUrl::FormattingOption(0x100)), line};
230+
QDeclarativeDebugData rd = {m_timer.nsecsElapsed(), (int)RangeLocation, (int)range, fileName.toString(QUrl::FormattingOption(0x100)), line};
231231
processMessage(rd);
232232
}
233233

@@ -236,7 +236,7 @@ void QDeclarativeDebugTrace::endRangeImpl(RangeType range)
236236
if (status() != Enabled || !m_enabled)
237237
return;
238238

239-
QDeclarativeDebugData rd = {m_timer.elapsed(), (int)RangeEnd, (int)range, QString(), -1};
239+
QDeclarativeDebugData rd = {m_timer.nsecsElapsed(), (int)RangeEnd, (int)range, QString(), -1};
240240
processMessage(rd);
241241
}
242242

src/declarative/debugger/qdeclarativedebugtrace_p.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@
4343
#define QDECLARATIVEDEBUGTRACE_P_H
4444

4545
#include <private/qdeclarativedebugservice_p.h>
46-
#include <private/qperformancetimer_p.h>
47-
#include <QtCore/qglobal.h>
46+
#include <qelapsedtimer.h>
4847

4948
QT_BEGIN_HEADER
5049

@@ -134,7 +133,7 @@ class Q_DECLARATIVE_EXPORT QDeclarativeDebugTrace : public QDeclarativeDebugServ
134133
#endif
135134
void processMessage(const QDeclarativeDebugData &);
136135
void sendMessages();
137-
QPerformanceTimer m_timer;
136+
QElapsedTimer m_timer;
138137
bool m_enabled;
139138
bool m_deferredSend;
140139
bool m_messageReceived;

src/declarative/qml/qml.pri

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@ SOURCES += \
5454
$$PWD/qdeclarativedirparser.cpp \
5555
$$PWD/qdeclarativeextensionplugin.cpp \
5656
$$PWD/qdeclarativeimport.cpp \
57-
$$PWD/qdeclarativelist.cpp \
58-
$$PWD/qperformancetimer.cpp
57+
$$PWD/qdeclarativelist.cpp
5958

6059
HEADERS += \
6160
$$PWD/qdeclarativeparser_p.h \
@@ -128,8 +127,7 @@ HEADERS += \
128127
$$PWD/qdeclarativedirparser_p.h \
129128
$$PWD/qdeclarativeextensioninterface.h \
130129
$$PWD/qdeclarativeimport_p.h \
131-
$$PWD/qdeclarativeextensionplugin.h \
132-
$$PWD/qperformancetimer_p.h
130+
$$PWD/qdeclarativeextensionplugin.h
133131

134132
QT += sql
135133
include(parser/parser.pri)

src/declarative/qml/qperformancetimer.cpp

Lines changed: 0 additions & 263 deletions
This file was deleted.

0 commit comments

Comments
 (0)