From b956d7417589403632a8ab10d924efd5fb199bc1 Mon Sep 17 00:00:00 2001
From: Stefan Hajnoczi <stefanha@jammr.net>
Date: Sun, 10 Apr 2022 08:31:28 +0100
Subject: tests: fix incomplete Qt 6 support

The "frameworks/4 qt" test covers Qt 4 and 5. There is already Qt 6 code
in the test but it is incomplete because translations are missing and Qt
6 requires C++17 or later to compile.
---
 test cases/frameworks/4 qt/meson.build       |  6 +++---
 test cases/frameworks/4 qt/qt6_lang.qrc      |  6 ++++++
 test cases/frameworks/4 qt/qt6core_fr.ts     | 12 ++++++++++++
 test cases/frameworks/4 qt/qt6embedded_fr.ts | 12 ++++++++++++
 4 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 test cases/frameworks/4 qt/qt6_lang.qrc
 create mode 100644 test cases/frameworks/4 qt/qt6core_fr.ts
 create mode 100644 test cases/frameworks/4 qt/qt6embedded_fr.ts

diff --git a/test cases/frameworks/4 qt/meson.build b/test cases/frameworks/4 qt/meson.build
index c7b594e..ef40c99 100644
--- a/test cases/frameworks/4 qt/meson.build	
+++ b/test cases/frameworks/4 qt/meson.build	
@@ -1,6 +1,6 @@
-project('qt4 and 5 build test', 'cpp',
-  # Qt5 now requires C++ 11 support
-  default_options : ['cpp_std=c++11'])
+project('qt4, qt5, and qt6 build test', 'cpp',
+  # Qt6 requires C++ 17 support
+  default_options : ['cpp_std=c++17'])
 
 qt5_modules = ['Widgets']
 qt6_modules = ['Widgets']
diff --git a/test cases/frameworks/4 qt/qt6_lang.qrc b/test cases/frameworks/4 qt/qt6_lang.qrc
new file mode 100644
index 0000000..12cc25a
--- /dev/null
+++ b/test cases/frameworks/4 qt/qt6_lang.qrc	
@@ -0,0 +1,6 @@
+<RCC>
+    <qresource prefix="/lang">
+        <file>qt6embedded_fr.qm</file>
+    </qresource>
+</RCC>
+
diff --git a/test cases/frameworks/4 qt/qt6core_fr.ts b/test cases/frameworks/4 qt/qt6core_fr.ts
new file mode 100644
index 0000000..4e3116b
--- /dev/null
+++ b/test cases/frameworks/4 qt/qt6core_fr.ts	
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="fr_FR">
+<context>
+    <name>QObject</name>
+    <message>
+        <location filename="q5core.cpp" line="23"/>
+        <source>Translate me!</source>
+        <translation>Traduisez moi!</translation>
+    </message>
+</context>
+</TS>
diff --git a/test cases/frameworks/4 qt/qt6embedded_fr.ts b/test cases/frameworks/4 qt/qt6embedded_fr.ts
new file mode 100644
index 0000000..4e3116b
--- /dev/null
+++ b/test cases/frameworks/4 qt/qt6embedded_fr.ts	
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="fr_FR">
+<context>
+    <name>QObject</name>
+    <message>
+        <location filename="q5core.cpp" line="23"/>
+        <source>Translate me!</source>
+        <translation>Traduisez moi!</translation>
+    </message>
+</context>
+</TS>
-- 
cgit v1.1