diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2017-04-03 14:46:06 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-04-03 12:58:35 +0000 |
| commit | 07806138bc0eb39dd93730c46bb536c8fbcf2038 (patch) | |
| tree | 518f812087ff6e481b6a5ac4234659371c857aca | |
| parent | 4e9768991978dc1720ca7a61a517afd44a95ccec (diff) | |
Fix build with namespaced Qt
Change-Id: I4e9114cc9f9adb0eb7a46dc30a9cbbda4c6dacda
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| -rw-r--r-- | app/perfelfmap.h | 3 | ||||
| -rw-r--r-- | tests/auto/elfmap/tst_elfmap.cpp | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/app/perfelfmap.h b/app/perfelfmap.h index 0355039..381fbc1 100644 --- a/app/perfelfmap.h +++ b/app/perfelfmap.h @@ -79,7 +79,10 @@ private: // elf sorted by start address QVector<ElfInfo> m_elfs; }; + +QT_BEGIN_NAMESPACE Q_DECLARE_TYPEINFO(PerfElfMap::ElfInfo, Q_MOVABLE_TYPE); +QT_END_NAMESPACE QDebug operator<<(QDebug stream, const PerfElfMap::ElfInfo& info); diff --git a/tests/auto/elfmap/tst_elfmap.cpp b/tests/auto/elfmap/tst_elfmap.cpp index d827826..de54e82 100644 --- a/tests/auto/elfmap/tst_elfmap.cpp +++ b/tests/auto/elfmap/tst_elfmap.cpp @@ -32,6 +32,7 @@ bool registerElf(PerfElfMap *map, const PerfElfMap::ElfInfo &info) } } +QT_BEGIN_NAMESPACE namespace QTest { template<> char *toString(const PerfElfMap::ElfInfo &info) @@ -42,6 +43,7 @@ char *toString(const PerfElfMap::ElfInfo &info) return qstrdup(qPrintable(string)); } } +QT_END_NAMESPACE class TestElfMap : public QObject { |