Skip to content

Commit 7e9bd43

Browse files
committed
Fix issues after review
1 parent d471b94 commit 7e9bd43

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

src/app/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ void qgisCrash( int signal )
436436
*/
437437
void myMessageOutput( QtMsgType type, const QMessageLogContext &, const QString &msg )
438438
{
439-
const auto encodedMsg = msg.toLocal8Bit();
439+
const QByteArray encodedMsg = msg.toLocal8Bit();
440440
switch ( type )
441441
{
442442
case QtDebugMsg:

src/core/qgseventtracing.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,14 @@
1818

1919
#include <future>
2020

21-
#include "qgslogger.h"
22-
2321
#include <QCoreApplication>
2422
#include <QFile>
2523
#include <QString>
2624
#include <QThread>
27-
#include <qmutex.h>
2825

2926
#ifdef HAVE_TRACY
27+
#include "qgslogger.h"
28+
3029
#include "tracy/Tracy.hpp"
3130
#include "tracy/TracyC.h"
3231
#endif
@@ -154,6 +153,7 @@ struct NameAndId
154153
friend size_t qHash( const NameAndId &key, size_t seed = 0 ) { return qHash( key.name, seed ) ^ qHash( key.id, seed ); }
155154
};
156155

156+
#ifdef HAVE_TRACY
157157
struct TracyZoneState
158158
{
159159
TracyCZoneCtx zoneCtx;
@@ -165,6 +165,7 @@ struct TracyZoneDummyThread
165165
QByteArray nameHandle;
166166
bool occupied;
167167
};
168+
#endif
168169

169170
void QgsEventTracing::addEvent( QgsEventTracing::EventType type, const QString &category, const QString &name, const QString &id )
170171
{

0 commit comments

Comments
 (0)