build,qt: Decouple generation of moc files

* m4/qt5.m4: Export moc for Qt 5 in variable MOC5. Unset temporary MOC2.
* m4/qt6.m4: Export moc for Qt 6 in variable MOC6.
* lang/qt/src/Makefile.am: Generate .moc5 files from .h files. Generate
.moc forwarding headers in moc5 subfolder. Add moc5 subfolder to include
paths for Qt 5-based qgpgme library. Ditto for Qt 6. Clean up moc5 and
moc6 subfolders.
* lang/qt/tests/Makefile.am: List tests and test runners for Qt 5 and
Qt 6. Generate .moc5 files from .cpp files of tests. Generate .moc
forwarding headers in moc5 subfolder. Generate .hmoc file from
t-support.h directly in moc5 subfolder. Add moc5 subfolder to include
paths for all Qt 5-based tests and runners. Ditto for Qt 6. Specify
sources, LDADD and CPPFLAGS for all tests and test runners for Qt 5 and
Qt 6. Clean up moc5 and moc6 subfolders.
--

The output of Qt 5's moc and Qt 6's moc is incompatible. Therefore, we
need to generate different .moc files for Qt 5 and Qt 6 to support
co-building of the Qt 5 and Qt 6 bindings. The duplication of the
listing of the tests couldn't be avoided because automake doesn't
understand `the_tests5 = $(the_tests:%=%5)` and couldn't match the
tests with their _SOURCES. Maybe some m4 programming would have helped,
but that would have made the Makefiles even more unreadable.

GnuPG-bug-id: 7205

4 files changed, 394 insertions, 103 deletions

diff --git a/lang/qt/src/Makefile.am b/lang/qt/src/Makefile.am
index 56da52d5..e98e31e4 100644
--- a/lang/qt/src/Makefile.am
+++ b/lang/qt/src/Makefile.am
@@ -336,27 +336,67 @@ camelcase6includedir = $(includedir)/$(includeprefix6)/QGpgME
 camelcase6include_HEADERS = $(camelcase_headers)
 endif
 
+# generate the moc files in two steps:
+# 1. generate Qt 5/6-specific moc files in builddir with extension .moc5/.moc6;
+#    this ensures correct dependencies on the source files
+# 2. generate forwarding headers in subfolders moc5/moc6 with extension .moc;
+#    this ensures that the "foo.moc" includes in the source files work and
+#    include the correct version of the generated moc files for Qt 5/6
+# GNU make's pattern rules would make this easier, but we don't want to use them
 if WANT_QT5
-AM_CPPFLAGS = -I$(top_builddir)/lang/cpp/src -I$(top_builddir)/src \
+moc5_dir = moc5
+qgpgme_moc5_sources = $(qgpgme_moc_sources:%.moc=%.moc5)
+qgpgme_moc5_forward_headers = $(qgpgme_moc_sources:%=$(moc5_dir)/%)
+
+.h.moc5:
+	$(MOC5) `test -f '$<' || echo '$(srcdir)/'`$< -o $@
+
+$(moc5_dir):
+	mkdir $(moc5_dir)
+
+$(qgpgme_moc5_forward_headers): Makefile.am | $(moc5_dir)
+	echo "#include \"../$(notdir $@)5\"" > "$@"
+endif
+if WANT_QT6
+moc6_dir = moc6
+qgpgme_moc6_sources = $(qgpgme_moc_sources:%.moc=%.moc6)
+qgpgme_moc6_forward_headers = $(qgpgme_moc_sources:%=$(moc6_dir)/%)
+
+.h.moc6:
+	$(MOC6) `test -f '$<' || echo '$(srcdir)/'`$< -o $@
+
+$(moc6_dir):
+	mkdir $(moc6_dir)
+
+$(qgpgme_moc6_forward_headers): Makefile.am | $(moc6_dir)
+	echo "#include \"../$(notdir $@)6\"" > "$@"
+endif
+
+if WANT_QT5
+AM_CPPFLAGS = -I./$(moc5_dir) -I$(top_builddir)/lang/cpp/src -I$(top_builddir)/src \
               @GPGME_QT5_CFLAGS@ @GPG_ERROR_CFLAGS@ @LIBASSUAN_CFLAGS@ \
               -DBUILDING_QGPGME -Wsuggest-override \
               -Wzero-as-null-pointer-constant
 
 libqgpgme_la_SOURCES = $(qgpgme_sources) $(qgpgme_headers) $(private_qgpgme_headers)
 
+nodist_libqgpgme_la_SOURCES = $(qgpgme_moc5_sources) $(qgpgme_moc5_forward_headers)
+
 libqgpgme_la_LIBADD = ../../cpp/src/libgpgmepp.la ../../../src/libgpgme.la \
                       @LIBASSUAN_LIBS@ @GPG_ERROR_LIBS@ @GPGME_QT5_LIBS@
 libqgpgme_la_LDFLAGS = -no-undefined -version-info \
                        @LIBQGPGME_LT_CURRENT@:@LIBQGPGME_LT_REVISION@:@LIBQGPGME_LT_AGE@
 endif
 if WANT_QT6
-AM_CPPFLAGS = -I$(top_builddir)/lang/cpp/src -I$(top_builddir)/src \
+AM_CPPFLAGS = -I./$(moc6_dir) -I$(top_builddir)/lang/cpp/src -I$(top_builddir)/src \
               @GPGME_QT6_CFLAGS@ @GPG_ERROR_CFLAGS@ @LIBASSUAN_CFLAGS@ \
               -DBUILDING_QGPGME -Wsuggest-override \
               -Wzero-as-null-pointer-constant
 
 libqgpgmeqt6_la_SOURCES = $(qgpgme_sources) $(qgpgme_headers) $(private_qgpgme_headers)
 
+nodist_libqgpgmeqt6_la_SOURCES = $(qgpgme_moc6_sources) $(qgpgme_moc6_forward_headers)
+
 libqgpgmeqt6_la_LIBADD = ../../cpp/src/libgpgmepp.la ../../../src/libgpgme.la \
                          @LIBASSUAN_LIBS@ @GPG_ERROR_LIBS@ @GPGME_QT6_LIBS@
 libqgpgmeqt6_la_LDFLAGS = -no-undefined -version-info \
@@ -449,20 +489,18 @@ install-data-local: $(install_cmake_files_qt5) $(install_cmake_files_qt6)
 uninstall-hook: $(uninstall_cmake_files_qt5) $(uninstall_cmake_files_qt6) \
 		$(uninstall_include_dirs_qt5) $(uninstall_include_dirs_qt6)
 
-BUILT_SOURCES = $(qgpgme_moc_sources) $(camelcase_headers)
+BUILT_SOURCES = $(qgpgme_moc5_sources) $(qgpgme_moc5_forward_headers) \
+		$(qgpgme_moc6_sources) $(qgpgme_moc6_forward_headers) \
+		$(camelcase_headers)
 
-CLEANFILES = $(qgpgme_moc_sources) $(camelcase_headers) QGpgmeConfig.cmake \
+CLEANFILES = $(qgpgme_moc5_sources) $(qgpgme_moc5_forward_headers) \
+	     $(qgpgme_moc6_sources) $(qgpgme_moc6_forward_headers) \
+	     $(camelcase_headers) QGpgmeConfig.cmake \
              qgpgme_version.h QGpgmeConfig.cmake.in \
              QGpgmeConfig-w32.cmake.in QGpgmeConfigVersion.cmake \
              QGpgmeQt6Config.cmake.in QGpgmeQt6Config-w32.cmake.in \
              QGpgmeQt6Config.cmake QGpgmeQt6ConfigVersion.cmake
 
-if WANT_QT5
-nodist_libqgpgme_la_SOURCES = $(qgpgme_moc_sources)
-endif
-if WANT_QT6
-nodist_libqgpgmeqt6_la_SOURCES = $(qgpgme_moc_sources)
-endif
-
-.h.moc:
-	$(MOC) `test -f '$<' || echo '$(srcdir)/'`$< -o $@
+clean-local:
+	-test -z "$(moc5_dir)" || rm -rf $(moc5_dir)
+	-test -z "$(moc6_dir)" || rm -rf $(moc6_dir)
diff --git a/lang/qt/tests/Makefile.am b/lang/qt/tests/Makefile.am
index 2072e049..2747a63c 100644
--- a/lang/qt/tests/Makefile.am
+++ b/lang/qt/tests/Makefile.am
@@ -27,43 +27,146 @@ TESTS_ENVIRONMENT = GNUPGHOME=$(GNUPGHOME)
 
 EXTRA_DIST = initial.test final.test
 
-the_tests = \
-	t-addexistingsubkey \
-	t-decryptverify \
-	t-keylist t-keylocate t-ownertrust t-tofuinfo \
-	t-encrypt t-verify t-various t-config t-remarks t-trustsignatures \
-	t-changeexpiryjob t-wkdlookup t-import t-revokekey t-setprimaryuserid
-
-TESTS = initial.test $(the_tests) final.test
-
-moc_files = \
-	t-addexistingsubkey.moc \
-	t-decryptverify.moc \
-	t-keylist.moc t-keylocate.moc t-ownertrust.moc t-tofuinfo.moc \
-	t-encrypt.moc t-support.hmoc t-wkspublish.moc t-verify.moc \
-	t-various.moc t-config.moc t-remarks.moc t-trustsignatures.moc \
-	t-changeexpiryjob.moc t-wkdlookup.moc t-import.moc t-revokekey.moc \
-	t-setprimaryuserid.moc
+if WANT_QT5
+the_tests5 = \
+	t-addexistingsubkey5 \
+	t-changeexpiryjob5 \
+	t-config5 \
+	t-decryptverify5 \
+	t-encrypt5 \
+	t-import5 \
+	t-keylist5 \
+	t-keylocate5 \
+	t-ownertrust5 \
+	t-remarks5 \
+	t-revokekey5 \
+	t-setprimaryuserid5 \
+	t-tofuinfo5 \
+	t-trustsignatures5 \
+	t-various5 \
+	t-verify5 \
+	t-wkdlookup5
+# disabled test: t-wkspublish5
+the_runners5 = \
+	run-decryptverifyarchivejob5 \
+	run-decryptverifyjob5 \
+	run-encryptarchivejob5 \
+	run-encryptjob5 \
+	run-exportjob5 \
+	run-importjob5 \
+	run-keyformailboxjob5 \
+	run-receivekeysjob5 \
+	run-refreshkeysjob5 \
+	run-signarchivejob5 \
+	run-signjob5 \
+	run-verifydetachedjob5 \
+	run-verifyopaquejob5 \
+	run-wkdrefreshjob5
+endif
+if WANT_QT6
+the_tests6 = \
+	t-addexistingsubkey6 \
+	t-changeexpiryjob6 \
+	t-config6 \
+	t-decryptverify6 \
+	t-encrypt6 \
+	t-import6 \
+	t-keylist6 \
+	t-keylocate6 \
+	t-ownertrust6 \
+	t-remarks6 \
+	t-revokekey6 \
+	t-setprimaryuserid6 \
+	t-tofuinfo6 \
+	t-trustsignatures6 \
+	t-various6 \
+	t-verify6 \
+	t-wkdlookup6
+# disabled test: t-wkspublish6
+the_runners6 = \
+	run-decryptverifyarchivejob6 \
+	run-decryptverifyjob6 \
+	run-encryptarchivejob6 \
+	run-encryptjob6 \
+	run-exportjob6 \
+	run-importjob6 \
+	run-keyformailboxjob6 \
+	run-receivekeysjob6 \
+	run-refreshkeysjob6 \
+	run-signarchivejob6 \
+	run-signjob6 \
+	run-verifydetachedjob6 \
+	run-verifyopaquejob6 \
+	run-wkdrefreshjob6
+endif
+
+TESTS = initial.test $(the_tests5) $(the_tests6) final.test
+
+# define .moc files for all tests; we'll moc their .cpp files
+# the only header that needs to be moc'd (t-support.h) is handled individually
+# moc_files = $(the_tests:%=%.moc)
+
+# generate the moc files in two steps:
+# 1. generate Qt 5/6-specific moc files in builddir with extension .moc5/.moc6;
+#    this ensures correct dependencies on the source files
+# 2. generate forwarding headers in subfolders moc5/moc6 with extension .moc;
+#    this ensures that the "foo.moc" includes in the source files work and
+#    include the correct version of the generated moc files for Qt 5/6
+# GNU make's pattern rules would make this easier, but we don't want to use them
+if WANT_QT5
+moc5_dir = moc5
+moc5_files = $(moc5_dir)/t-support.hmoc $(the_tests5:%5=%.moc5)
+moc5_forward_headers = $(the_tests5:%5=$(moc5_dir)/%.moc)
+
+$(moc5_dir)/t-support.hmoc: t-support.h | $(moc5_dir)
+	$(MOC5) `test -f '$<' || echo '$(srcdir)/'`$< -o $@
+
+.cpp.moc5:
+	$(MOC5) `test -f '$<' || echo '$(srcdir)/'`$< -o $@
+
+$(moc5_dir):
+	mkdir $(moc5_dir)
+
+$(moc5_forward_headers): Makefile.am | $(moc5_dir)
+	echo "#include \"../$(notdir $@)5\"" > "$@"
+endif
+if WANT_QT6
+moc6_dir = moc6
+moc6_files = $(moc6_dir)/t-support.hmoc $(the_tests6:%6=%.moc6)
+moc6_forward_headers = $(the_tests6:%6=$(moc6_dir)/%.moc)
+
+$(moc6_dir)/t-support.hmoc: t-support.h | $(moc6_dir)
+	$(MOC6) `test -f '$<' || echo '$(srcdir)/'`$< -o $@
+
+.cpp.moc6:
+	$(MOC6) `test -f '$<' || echo '$(srcdir)/'`$< -o $@
+
+$(moc6_dir):
+	mkdir $(moc6_dir)
+
+$(moc6_forward_headers): Makefile.am | $(moc6_dir)
+	echo "#include \"../$(notdir $@)6\"" > "$@"
+endif
 
 AM_LDFLAGS = -no-install
 
 if WANT_QT5
-LDADD = ../../cpp/src/libgpgmepp.la ../src/libqgpgme.la \
+ldadd_qt5 = ../../cpp/src/libgpgmepp.la ../src/libqgpgme.la \
         ../../../src/libgpgme.la @GPGME_QT5_LIBS@ @GPG_ERROR_LIBS@ \
         @GPGME_QT5TEST_LIBS@ @LDADD_FOR_TESTS_KLUDGE@ -lstdc++
 
-AM_CPPFLAGS = -I$(top_srcdir)/lang/qt/src -I$(top_builddir)/lang/cpp/src \
+cppflags_qt5 = -I$(moc5_dir) -I$(top_srcdir)/lang/qt/src -I$(top_builddir)/lang/cpp/src \
               -I$(top_builddir)/src \
               @GPG_ERROR_CFLAGS@ @GPGME_QT5_CFLAGS@ @GPG_ERROR_CFLAGS@ \
               @LIBASSUAN_CFLAGS@ @GPGME_QT5TEST_CFLAGS@ -DBUILDING_QGPGME \
               -DTOP_SRCDIR="$(top_srcdir)"
 endif
 if WANT_QT6
-LDADD = ../../cpp/src/libgpgmepp.la ../src/libqgpgmeqt6.la \
+ldadd_qt6 = ../../cpp/src/libgpgmepp.la ../src/libqgpgmeqt6.la \
         ../../../src/libgpgme.la @GPGME_QT6_LIBS@ @GPG_ERROR_LIBS@ \
         @GPGME_QT6TEST_LIBS@ @LDADD_FOR_TESTS_KLUDGE@ -lstdc++
 
-AM_CPPFLAGS = -I$(top_srcdir)/lang/qt/src -I$(top_builddir)/lang/cpp/src \
+cppflags_qt6 = -I$(moc6_dir) -I$(top_srcdir)/lang/qt/src -I$(top_builddir)/lang/cpp/src \
               -I$(top_builddir)/src \
               @GPG_ERROR_CFLAGS@ @GPGME_QT6_CFLAGS@ @GPG_ERROR_CFLAGS@ \
               @LIBASSUAN_CFLAGS@ @GPGME_QT6TEST_CFLAGS@ -DBUILDING_QGPGME \
@@ -72,68 +175,223 @@ endif
 
 support_src = t-support.h t-support.cpp
 
-t_addexistingsubkey_SOURCES = t-addexistingsubkey.cpp $(support_src)
-t_decryptverify_SOURCES = t-decryptverify.cpp $(support_src)
-t_keylist_SOURCES = t-keylist.cpp $(support_src)
-t_keylocate_SOURCES = t-keylocate.cpp $(support_src)
-t_ownertrust_SOURCES = t-ownertrust.cpp $(support_src)
-t_tofuinfo_SOURCES = t-tofuinfo.cpp $(support_src)
-t_encrypt_SOURCES = t-encrypt.cpp $(support_src)
-t_wkspublish_SOURCES = t-wkspublish.cpp $(support_src)
-t_verify_SOURCES = t-verify.cpp $(support_src)
-t_various_SOURCES = t-various.cpp $(support_src)
-t_config_SOURCES = t-config.cpp $(support_src)
-t_remarks_SOURCES = t-remarks.cpp $(support_src)
-t_trustsignatures_SOURCES = t-trustsignatures.cpp $(support_src)
-t_changeexpiryjob_SOURCES = t-changeexpiryjob.cpp $(support_src)
-t_wkdlookup_SOURCES = t-wkdlookup.cpp $(support_src)
-t_import_SOURCES = t-import.cpp $(support_src)
-t_revokekey_SOURCES = t-revokekey.cpp $(support_src)
-t_setprimaryuserid_SOURCES = t-setprimaryuserid.cpp $(support_src)
-run_decryptverifyjob_SOURCES = run-decryptverifyjob.cpp
-run_decryptverifyarchivejob_SOURCES = run-decryptverifyarchivejob.cpp
-run_encryptarchivejob_SOURCES = run-encryptarchivejob.cpp
-run_encryptjob_SOURCES = run-encryptjob.cpp
-run_exportjob_SOURCES = run-exportjob.cpp
-run_importjob_SOURCES = run-importjob.cpp
-run_keyformailboxjob_SOURCES = run-keyformailboxjob.cpp
-run_receivekeysjob_SOURCES = run-receivekeysjob.cpp
-run_refreshkeysjob_SOURCES = run-refreshkeysjob.cpp
-run_signarchivejob_SOURCES = run-signarchivejob.cpp
-run_signjob_SOURCES = run-signjob.cpp
-run_verifydetachedjob_SOURCES = run-verifydetachedjob.cpp
-run_verifyopaquejob_SOURCES = run-verifyopaquejob.cpp
-run_wkdrefreshjob_SOURCES = run-wkdrefreshjob.cpp
-
-nodist_t_keylist_SOURCES = $(moc_files)
-
-BUILT_SOURCES = $(moc_files) pubring-stamp
-
-noinst_PROGRAMS = \
-	t-addexistingsubkey \
-	t-decryptverify \
-	t-keylist t-keylocate t-ownertrust t-tofuinfo t-encrypt \
-	run-keyformailboxjob t-wkspublish t-verify t-various t-config t-remarks \
-	t-trustsignatures t-changeexpiryjob t-wkdlookup t-import t-revokekey \
-	t-setprimaryuserid \
-	run-decryptverifyarchivejob \
-	run-decryptverifyjob \
-	run-encryptarchivejob \
-	run-encryptjob \
-	run-importjob run-exportjob run-receivekeysjob run-refreshkeysjob \
-	run-signarchivejob \
-	run-signjob \
-	run-verifydetachedjob \
-	run-verifyopaquejob \
-	run-wkdrefreshjob
+if WANT_QT5
+t_addexistingsubkey5_SOURCES = t-addexistingsubkey.cpp $(support_src)
+t_addexistingsubkey5_LDADD = $(ldadd_qt5)
+t_addexistingsubkey5_CPPFLAGS = $(cppflags_qt5)
+t_changeexpiryjob5_SOURCES = t-changeexpiryjob.cpp $(support_src)
+t_changeexpiryjob5_LDADD = $(ldadd_qt5)
+t_changeexpiryjob5_CPPFLAGS = $(cppflags_qt5)
+t_config5_SOURCES = t-config.cpp $(support_src)
+t_config5_LDADD = $(ldadd_qt5)
+t_config5_CPPFLAGS = $(cppflags_qt5)
+t_decryptverify5_SOURCES = t-decryptverify.cpp $(support_src)
+t_decryptverify5_LDADD = $(ldadd_qt5)
+t_decryptverify5_CPPFLAGS = $(cppflags_qt5)
+t_encrypt5_SOURCES = t-encrypt.cpp $(support_src)
+t_encrypt5_LDADD = $(ldadd_qt5)
+t_encrypt5_CPPFLAGS = $(cppflags_qt5)
+t_import5_SOURCES = t-import.cpp $(support_src)
+t_import5_LDADD = $(ldadd_qt5)
+t_import5_CPPFLAGS = $(cppflags_qt5)
+t_keylist5_SOURCES = t-keylist.cpp $(support_src)
+t_keylist5_LDADD = $(ldadd_qt5)
+t_keylist5_CPPFLAGS = $(cppflags_qt5)
+t_keylocate5_SOURCES = t-keylocate.cpp $(support_src)
+t_keylocate5_LDADD = $(ldadd_qt5)
+t_keylocate5_CPPFLAGS = $(cppflags_qt5)
+t_ownertrust5_SOURCES = t-ownertrust.cpp $(support_src)
+t_ownertrust5_LDADD = $(ldadd_qt5)
+t_ownertrust5_CPPFLAGS = $(cppflags_qt5)
+t_remarks5_SOURCES = t-remarks.cpp $(support_src)
+t_remarks5_LDADD = $(ldadd_qt5)
+t_remarks5_CPPFLAGS = $(cppflags_qt5)
+t_revokekey5_SOURCES = t-revokekey.cpp $(support_src)
+t_revokekey5_LDADD = $(ldadd_qt5)
+t_revokekey5_CPPFLAGS = $(cppflags_qt5)
+t_setprimaryuserid5_SOURCES = t-setprimaryuserid.cpp $(support_src)
+t_setprimaryuserid5_LDADD = $(ldadd_qt5)
+t_setprimaryuserid5_CPPFLAGS = $(cppflags_qt5)
+t_tofuinfo5_SOURCES = t-tofuinfo.cpp $(support_src)
+t_tofuinfo5_LDADD = $(ldadd_qt5)
+t_tofuinfo5_CPPFLAGS = $(cppflags_qt5)
+t_trustsignatures5_SOURCES = t-trustsignatures.cpp $(support_src)
+t_trustsignatures5_LDADD = $(ldadd_qt5)
+t_trustsignatures5_CPPFLAGS = $(cppflags_qt5)
+t_various5_SOURCES = t-various.cpp $(support_src)
+t_various5_LDADD = $(ldadd_qt5)
+t_various5_CPPFLAGS = $(cppflags_qt5)
+t_verify5_SOURCES = t-verify.cpp $(support_src)
+t_verify5_LDADD = $(ldadd_qt5)
+t_verify5_CPPFLAGS = $(cppflags_qt5)
+t_wkdlookup5_SOURCES = t-wkdlookup.cpp $(support_src)
+t_wkdlookup5_LDADD = $(ldadd_qt5)
+t_wkdlookup5_CPPFLAGS = $(cppflags_qt5)
+# t_wkspublish5_SOURCES = t-wkspublish.cpp $(support_src)
+# t_wkspublish5_LDADD = $(ldadd_qt5)
+# t_wkspublish5_CPPFLAGS = $(cppflags_qt5)
+run_decryptverifyarchivejob5_SOURCES = run-decryptverifyarchivejob.cpp
+run_decryptverifyarchivejob5_LDADD = $(ldadd_qt5)
+run_decryptverifyarchivejob5_CPPFLAGS = $(cppflags_qt5)
+run_decryptverifyjob5_SOURCES = run-decryptverifyjob.cpp
+run_decryptverifyjob5_LDADD = $(ldadd_qt5)
+run_decryptverifyjob5_CPPFLAGS = $(cppflags_qt5)
+run_encryptarchivejob5_SOURCES = run-encryptarchivejob.cpp
+run_encryptarchivejob5_LDADD = $(ldadd_qt5)
+run_encryptarchivejob5_CPPFLAGS = $(cppflags_qt5)
+run_encryptjob5_SOURCES = run-encryptjob.cpp
+run_encryptjob5_LDADD = $(ldadd_qt5)
+run_encryptjob5_CPPFLAGS = $(cppflags_qt5)
+run_exportjob5_SOURCES = run-exportjob.cpp
+run_exportjob5_LDADD = $(ldadd_qt5)
+run_exportjob5_CPPFLAGS = $(cppflags_qt5)
+run_importjob5_SOURCES = run-importjob.cpp
+run_importjob5_LDADD = $(ldadd_qt5)
+run_importjob5_CPPFLAGS = $(cppflags_qt5)
+run_keyformailboxjob5_SOURCES = run-keyformailboxjob.cpp
+run_keyformailboxjob5_LDADD = $(ldadd_qt5)
+run_keyformailboxjob5_CPPFLAGS = $(cppflags_qt5)
+run_receivekeysjob5_SOURCES = run-receivekeysjob.cpp
+run_receivekeysjob5_LDADD = $(ldadd_qt5)
+run_receivekeysjob5_CPPFLAGS = $(cppflags_qt5)
+run_refreshkeysjob5_SOURCES = run-refreshkeysjob.cpp
+run_refreshkeysjob5_LDADD = $(ldadd_qt5)
+run_refreshkeysjob5_CPPFLAGS = $(cppflags_qt5)
+run_signarchivejob5_SOURCES = run-signarchivejob.cpp
+run_signarchivejob5_LDADD = $(ldadd_qt5)
+run_signarchivejob5_CPPFLAGS = $(cppflags_qt5)
+run_signjob5_SOURCES = run-signjob.cpp
+run_signjob5_LDADD = $(ldadd_qt5)
+run_signjob5_CPPFLAGS = $(cppflags_qt5)
+run_verifydetachedjob5_SOURCES = run-verifydetachedjob.cpp
+run_verifydetachedjob5_LDADD = $(ldadd_qt5)
+run_verifydetachedjob5_CPPFLAGS = $(cppflags_qt5)
+run_verifyopaquejob5_SOURCES = run-verifyopaquejob.cpp
+run_verifyopaquejob5_LDADD = $(ldadd_qt5)
+run_verifyopaquejob5_CPPFLAGS = $(cppflags_qt5)
+run_wkdrefreshjob5_SOURCES = run-wkdrefreshjob.cpp
+run_wkdrefreshjob5_LDADD = $(ldadd_qt5)
+run_wkdrefreshjob5_CPPFLAGS = $(cppflags_qt5)
+
+#nodist_t_keylist5_SOURCES = $(moc5_files) $(moc5_forward_headers)
+endif
+if WANT_QT6
+t_addexistingsubkey6_SOURCES = t-addexistingsubkey.cpp $(support_src)
+t_addexistingsubkey6_LDADD = $(ldadd_qt6)
+t_addexistingsubkey6_CPPFLAGS = $(cppflags_qt6)
+t_changeexpiryjob6_SOURCES = t-changeexpiryjob.cpp $(support_src)
+t_changeexpiryjob6_LDADD = $(ldadd_qt6)
+t_changeexpiryjob6_CPPFLAGS = $(cppflags_qt6)
+t_config6_SOURCES = t-config.cpp $(support_src)
+t_config6_LDADD = $(ldadd_qt6)
+t_config6_CPPFLAGS = $(cppflags_qt6)
+t_decryptverify6_SOURCES = t-decryptverify.cpp $(support_src)
+t_decryptverify6_LDADD = $(ldadd_qt6)
+t_decryptverify6_CPPFLAGS = $(cppflags_qt6)
+t_encrypt6_SOURCES = t-encrypt.cpp $(support_src)
+t_encrypt6_LDADD = $(ldadd_qt6)
+t_encrypt6_CPPFLAGS = $(cppflags_qt6)
+t_import6_SOURCES = t-import.cpp $(support_src)
+t_import6_LDADD = $(ldadd_qt6)
+t_import6_CPPFLAGS = $(cppflags_qt6)
+t_keylist6_SOURCES = t-keylist.cpp $(support_src)
+t_keylist6_LDADD = $(ldadd_qt6)
+t_keylist6_CPPFLAGS = $(cppflags_qt6)
+t_keylocate6_SOURCES = t-keylocate.cpp $(support_src)
+t_keylocate6_LDADD = $(ldadd_qt6)
+t_keylocate6_CPPFLAGS = $(cppflags_qt6)
+t_ownertrust6_SOURCES = t-ownertrust.cpp $(support_src)
+t_ownertrust6_LDADD = $(ldadd_qt6)
+t_ownertrust6_CPPFLAGS = $(cppflags_qt6)
+t_remarks6_SOURCES = t-remarks.cpp $(support_src)
+t_remarks6_LDADD = $(ldadd_qt6)
+t_remarks6_CPPFLAGS = $(cppflags_qt6)
+t_revokekey6_SOURCES = t-revokekey.cpp $(support_src)
+t_revokekey6_LDADD = $(ldadd_qt6)
+t_revokekey6_CPPFLAGS = $(cppflags_qt6)
+t_setprimaryuserid6_SOURCES = t-setprimaryuserid.cpp $(support_src)
+t_setprimaryuserid6_LDADD = $(ldadd_qt6)
+t_setprimaryuserid6_CPPFLAGS = $(cppflags_qt6)
+t_tofuinfo6_SOURCES = t-tofuinfo.cpp $(support_src)
+t_tofuinfo6_LDADD = $(ldadd_qt6)
+t_tofuinfo6_CPPFLAGS = $(cppflags_qt6)
+t_trustsignatures6_SOURCES = t-trustsignatures.cpp $(support_src)
+t_trustsignatures6_LDADD = $(ldadd_qt6)
+t_trustsignatures6_CPPFLAGS = $(cppflags_qt6)
+t_various6_SOURCES = t-various.cpp $(support_src)
+t_various6_LDADD = $(ldadd_qt6)
+t_various6_CPPFLAGS = $(cppflags_qt6)
+t_verify6_SOURCES = t-verify.cpp $(support_src)
+t_verify6_LDADD = $(ldadd_qt6)
+t_verify6_CPPFLAGS = $(cppflags_qt6)
+t_wkdlookup6_SOURCES = t-wkdlookup.cpp $(support_src)
+t_wkdlookup6_LDADD = $(ldadd_qt6)
+t_wkdlookup6_CPPFLAGS = $(cppflags_qt6)
+# t_wkspublish6_SOURCES = t-wkspublish.cpp $(support_src)
+# t_wkspublish6_LDADD = $(ldadd_qt6)
+# t_wkspublish6_CPPFLAGS = $(cppflags_qt6)
+run_decryptverifyarchivejob6_SOURCES = run-decryptverifyarchivejob.cpp
+run_decryptverifyarchivejob6_LDADD = $(ldadd_qt6)
+run_decryptverifyarchivejob6_CPPFLAGS = $(cppflags_qt6)
+run_decryptverifyjob6_SOURCES = run-decryptverifyjob.cpp
+run_decryptverifyjob6_LDADD = $(ldadd_qt6)
+run_decryptverifyjob6_CPPFLAGS = $(cppflags_qt6)
+run_encryptarchivejob6_SOURCES = run-encryptarchivejob.cpp
+run_encryptarchivejob6_LDADD = $(ldadd_qt6)
+run_encryptarchivejob6_CPPFLAGS = $(cppflags_qt6)
+run_encryptjob6_SOURCES = run-encryptjob.cpp
+run_encryptjob6_LDADD = $(ldadd_qt6)
+run_encryptjob6_CPPFLAGS = $(cppflags_qt6)
+run_exportjob6_SOURCES = run-exportjob.cpp
+run_exportjob6_LDADD = $(ldadd_qt6)
+run_exportjob6_CPPFLAGS = $(cppflags_qt6)
+run_importjob6_SOURCES = run-importjob.cpp
+run_importjob6_LDADD = $(ldadd_qt6)
+run_importjob6_CPPFLAGS = $(cppflags_qt6)
+run_keyformailboxjob6_SOURCES = run-keyformailboxjob.cpp
+run_keyformailboxjob6_LDADD = $(ldadd_qt6)
+run_keyformailboxjob6_CPPFLAGS = $(cppflags_qt6)
+run_receivekeysjob6_SOURCES = run-receivekeysjob.cpp
+run_receivekeysjob6_LDADD = $(ldadd_qt6)
+run_receivekeysjob6_CPPFLAGS = $(cppflags_qt6)
+run_refreshkeysjob6_SOURCES = run-refreshkeysjob.cpp
+run_refreshkeysjob6_LDADD = $(ldadd_qt6)
+run_refreshkeysjob6_CPPFLAGS = $(cppflags_qt6)
+run_signarchivejob6_SOURCES = run-signarchivejob.cpp
+run_signarchivejob6_LDADD = $(ldadd_qt6)
+run_signarchivejob6_CPPFLAGS = $(cppflags_qt6)
+run_signjob6_SOURCES = run-signjob.cpp
+run_signjob6_LDADD = $(ldadd_qt6)
+run_signjob6_CPPFLAGS = $(cppflags_qt6)
+run_verifydetachedjob6_SOURCES = run-verifydetachedjob.cpp
+run_verifydetachedjob6_LDADD = $(ldadd_qt6)
+run_verifydetachedjob6_CPPFLAGS = $(cppflags_qt6)
+run_verifyopaquejob6_SOURCES = run-verifyopaquejob.cpp
+run_verifyopaquejob6_LDADD = $(ldadd_qt6)
+run_verifyopaquejob6_CPPFLAGS = $(cppflags_qt6)
+run_wkdrefreshjob6_SOURCES = run-wkdrefreshjob.cpp
+run_wkdrefreshjob6_LDADD = $(ldadd_qt6)
+run_wkdrefreshjob6_CPPFLAGS = $(cppflags_qt6)
+
+# nodist_t_keylist6_SOURCES = $(moc6_files) $(moc6_forward_headers)
+endif
 
+BUILT_SOURCES = $(moc5_files) $(moc5_forward_headers) \
+		$(moc6_files) $(moc6_forward_headers) \
+		pubring-stamp
+
+noinst_PROGRAMS = $(the_tests5) $(the_runners5) $(the_tests6) $(the_runners6)
 
 CLEANFILES = secring.gpg pubring.gpg pubring.kbx trustdb.gpg dirmngr.conf \
 	gpg-agent.conf pubring.kbx~ S.gpg-agent gpg.conf pubring.gpg~ \
-	random_seed S.gpg-agent .gpg-v21-migrated pubring-stamp $(moc_files) \
+	random_seed S.gpg-agent .gpg-v21-migrated pubring-stamp \
+	$(moc5_files) $(moc5_forward_headers) \
+	$(moc6_files) $(moc6_forward_headers) \
 	gpg.conf tofu.db reader_0.status reader_1.status
 
 clean-local:
+	-test -z "$(moc5_dir)" || rm -rf $(moc5_dir)
+	-test -z "$(moc6_dir)" || rm -rf $(moc6_dir)
 	-$(TESTS_ENVIRONMENT) $(top_srcdir)/tests/start-stop-agent --stop
 	-rm -fR  private-keys-v1.d crls.d
 
@@ -151,9 +409,3 @@ pubring-stamp: $(top_srcdir)/tests/gpg/pubdemo.asc \
            --import $(top_srcdir)/tests/gpg/secdemo.asc
 	-$(TESTS_ENVIRONMENT) gpgconf --kill all
 	touch pubring-stamp
-
-.cpp.moc:
-	$(MOC) `test -f '$<' || echo '$(srcdir)/'`$< -o $@
-
-.h.hmoc:
-	$(MOC) `test -f '$<' || echo '$(srcdir)/'`$< -o $@
diff --git a/m4/qt5.m4 b/m4/qt5.m4
index ecf044fc..cc453261 100644
--- a/m4/qt5.m4
+++ b/m4/qt5.m4
@@ -5,7 +5,7 @@ dnl This file is part of gpgme and is provided under the same license as gpgme
 
 dnl Autoconf macro to find Qt5
 dnl
-dnl sets GPGME_QT5_LIBS and GPGME_QT5_CFLAGS
+dnl sets GPGME_QT5_LIBS, GPGME_QT5_CFLAGS, and MOC5
 dnl
 dnl if QT5 was found have_qt5_libs is set to yes
 
@@ -29,9 +29,9 @@ AC_DEFUN([FIND_QT5],
     fi
   fi
   if test "$have_qt5_libs" = "yes"; then
-    AC_CHECK_TOOL(MOC, moc)
+    AC_CHECK_TOOL(MOC5, moc)
     AC_MSG_CHECKING([moc version])
-    mocversion=`$MOC -v 2>&1`
+    mocversion=`$MOC5 -v 2>&1`
     mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc 5"`
     if test x"$mocversiongrep" != x"$mocversion"; then
       AC_MSG_RESULT([no])
@@ -48,11 +48,12 @@ AC_DEFUN([FIND_QT5],
           # no valid moc found
           have_qt5_libs="no";
         else
-          MOC=$qt5tooldir/moc
+          MOC5=$qt5tooldir/moc
         fi
       else
-        MOC=$MOC2
+        MOC5=$MOC2
       fi
+      unset MOC2
     fi
     AC_MSG_RESULT([$mocversion])
   fi
diff --git a/m4/qt6.m4 b/m4/qt6.m4
index 8a3322a7..f62a9069 100644
--- a/m4/qt6.m4
+++ b/m4/qt6.m4
@@ -5,7 +5,7 @@ dnl This file is part of gpgme and is provided under the same license as gpgme
 
 dnl Autoconf macro to find Qt6
 dnl
-dnl sets GPGME_QT6_LIBS and GPGME_QT6_CFLAGS
+dnl sets GPGME_QT6_LIBS, GPGME_QT6_CFLAGS, and MOC6
 dnl
 dnl if QT6 was found have_qt6_libs is set to yes
 
@@ -26,8 +26,8 @@ AC_DEFUN([FIND_QT6],
   if test "$have_qt6_libs" = "yes"; then
     # Qt6 moved moc to libexec
     qt6libexecdir=$($PKG_CONFIG --variable=libexecdir 'Qt6Core >= 6.4.0')
-    AC_PATH_TOOL(MOC, moc, [], [$qt6libexecdir])
-    if test -z "$MOC"; then
+    AC_PATH_TOOL(MOC6, moc, [], [$qt6libexecdir])
+    if test -z "$MOC6"; then
       AC_MSG_WARN([moc not found - Qt 6 binding will not be built.])
       have_qt6_libs="no";
     fi