From 069a75d44bba3d68d14c6c18b8e793e9ede00b81 Mon Sep 17 00:00:00 2001
From: Andre Rummler <andre.rummler@cern.ch>
Date: Tue, 22 Sep 2026 09:08:03 +0200
Subject: [PATCH] Use pugixml target in test removing the old directly
 including approach. Fix a static variable which is now missing as the
 correspondign source file is not used by the particular test.

---
 tests/qttest/CMakeLists.txt     | 7 +++----
 tests/qttest/tst_qetstrings.cpp | 3 +++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/tests/qttest/CMakeLists.txt b/tests/qttest/CMakeLists.txt
index acfe52b36..0b140cedf 100644
--- a/tests/qttest/CMakeLists.txt
+++ b/tests/qttest/CMakeLists.txt
@@ -141,7 +141,7 @@ add_executable(
   ${QET_DIR}/sources/shortcutmanager.cpp)
 add_test(NAME tst_qetstrings COMMAND tst_qetstrings)
 target_include_directories(tst_qetstrings PRIVATE ${QET_DIR}/sources)
-target_link_libraries(tst_qetstrings PRIVATE Qt::Test Qt::Widgets Qt::Xml)
+target_link_libraries(tst_qetstrings PRIVATE Qt::Test Qt::Widgets Qt::Xml pugixml::pugixml)
 
 # CrashHandler::formatInt() -- the async-signal-safe decimal formatter the
 # signal handler uses for the "Signal: N" line of a crash dump. Compiles
@@ -179,11 +179,10 @@ add_test(NAME tst_crashdumps COMMAND tst_crashdumps)
 target_include_directories(tst_crashdumps PRIVATE
   ${QET_DIR}
   ${QET_DIR}/sources
-  ${QET_DIR}/sources/NameList
-  ${QET_DIR}/pugixml/src)
+  ${QET_DIR}/sources/NameList)
 if(Backtrace_FOUND)
   target_link_libraries(tst_crashdumps PRIVATE
-    Qt::Test Qt::Widgets Qt::Xml ${Backtrace_LIBRARIES})
+    Qt::Test Qt::Widgets Qt::Xml pugixml::pugixml ${Backtrace_LIBRARIES})
 else()
   target_link_libraries(tst_crashdumps PRIVATE Qt::Test Qt::Widgets Qt::Xml)
 endif()
diff --git a/tests/qttest/tst_qetstrings.cpp b/tests/qttest/tst_qetstrings.cpp
index f7e68011d..1b46ecfe6 100644
--- a/tests/qttest/tst_qetstrings.cpp
+++ b/tests/qttest/tst_qetstrings.cpp
@@ -1,6 +1,9 @@
 #include <QtTest>
 
 #include "qet.h"
+#include "qetapp.h"
+
+QString QETApp::m_interface_language;
 
 /**
 	QET::joinWithSpaces() / QET::splitWithSpaces() are the wire format for the