diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2018-01-25 11:29:42 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2018-01-25 10:59:18 +0000 |
| commit | d733587d85adcde017e772486dada4181a74d4f0 (patch) | |
| tree | 6be6ff7dd10da2344f972dfe4c1ace8bb84c364a | |
| parent | f5ed424f58b2b2e22dd6da2d9fdbf8d36c5764f3 (diff) | |
Return default architecture as const char *
Implicit construction of QByteArray does not work here.
Change-Id: I0d891680b84b635bdc918fd13440510849dee1f7
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | app/perfregisterinfo.cpp | 2 | ||||
| -rw-r--r-- | app/perfregisterinfo.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/perfregisterinfo.cpp b/app/perfregisterinfo.cpp index 4d87397..3217faa 100644 --- a/app/perfregisterinfo.cpp +++ b/app/perfregisterinfo.cpp @@ -102,7 +102,7 @@ const int PerfRegisterInfo::s_dummyRegisters[ARCH_INVALID][2] = { {0, 0} }; -QByteArray PerfRegisterInfo::defaultArchitecture() +const char *PerfRegisterInfo::defaultArchitecture() { #if defined(__aarch64__) return "aarch64"; diff --git a/app/perfregisterinfo.h b/app/perfregisterinfo.h index 5668426..1a4ed74 100644 --- a/app/perfregisterinfo.h +++ b/app/perfregisterinfo.h @@ -61,5 +61,5 @@ public: static const int s_dummyRegisters[ARCH_INVALID][2]; // default architecture for the system which was used for compilation - static QByteArray defaultArchitecture(); + static const char *defaultArchitecture(); }; |