diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-06 15:35:06 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-06 19:00:41 +0200 |
| commit | 2a302a73613d68475e667f69b8e36ce07853c813 (patch) | |
| tree | 06de55baaed993b51af517dba8f230fab749882c /src/tools/tracegen | |
| parent | 5505d25be972948db1621e1511b89b4144aa8bfc (diff) | |
| parent | dea7110b29c5c68a5b09454c968324042ed1b607 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/qt6
Change-Id: Iac12a37fa6536ebe30e6548f7c54ec0c402c9f5d
Diffstat (limited to 'src/tools/tracegen')
| -rw-r--r-- | src/tools/tracegen/etw.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/tracegen/etw.cpp b/src/tools/tracegen/etw.cpp index acd81bd5c1..eac518dbab 100644 --- a/src/tools/tracegen/etw.cpp +++ b/src/tools/tracegen/etw.cpp @@ -90,7 +90,7 @@ static QString createGuid(const QUuid &uuid) QTextStream stream(&guid); - hex(stream); + Qt::hex(stream); stream << "(" << "0x" << uuid.data1 << ", " |