From d42953160b3ce6750817a15a35ae3b10bd576559 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Mon, 21 Jun 2021 16:15:33 +0200
Subject: [PATCH] Fix build in clangd tests

Amends 40181057cd6ada17d7b4eba05830e16f66e7fee5

Complained that the Q_DECLARE_METATYPE comes too late.

Change-Id: Id5dd355fadcb4a6790d4c74dd1c637e0b1569aa4
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/plugins/clangcodemodel/test/clangdtests.cpp | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/plugins/clangcodemodel/test/clangdtests.cpp b/src/plugins/clangcodemodel/test/clangdtests.cpp
index d27c5be03a1..fcc43db4ca3 100644
--- a/src/plugins/clangcodemodel/test/clangdtests.cpp
+++ b/src/plugins/clangcodemodel/test/clangdtests.cpp
@@ -59,6 +59,18 @@ namespace ClangCodeModel {
 namespace Internal {
 namespace Tests {
 
+using Range = std::tuple<int, int, int>;
+
+} // namespace Tests
+} // namespace Internal
+} // namespace ClangCodeModel
+
+Q_DECLARE_METATYPE(ClangCodeModel::Internal::Tests::Range)
+
+namespace ClangCodeModel {
+namespace Internal {
+namespace Tests {
+
 ClangdTest::~ClangdTest()
 {
     if (m_project)
@@ -372,8 +384,6 @@ ClangdTestLocalReferences::ClangdTestLocalReferences()
     setMinimumVersion(13);
 }
 
-using Range = std::tuple<int, int, int>;
-
 // We currently only support local variables, but if and when clangd implements
 // the linkedEditingRange request, we can change the expected values for
 // the file-scope test cases from empty ranges to the actual locations.
@@ -486,5 +496,3 @@ void ClangdTestLocalReferences::test()
 } // namespace Tests
 } // namespace Internal
 } // namespace ClangCodeModel
-
-Q_DECLARE_METATYPE(ClangCodeModel::Internal::Tests::Range)