Page MenuHome GnuPG
Files F23020899

No OneTemporary
Actions

View Options

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
@@ -1,468 +1,506 @@
# Makefile.am for QGpgME.
# Copyright (C) 2016 Bundesamt für Sicherheit in der Informationstechnik
# Software engineering by Intevation GmbH
#
# This file is part of QGpgME, the Qt API binding for GpgME.
#
# QGpgME is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# QGpgME is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA
if WANT_QT5
lib_LTLIBRARIES = libqgpgme.la
endif
if WANT_QT6
lib_LTLIBRARIES = libqgpgmeqt6.la
endif
EXTRA_DIST = QGpgmeConfig.cmake.in.in QGpgmeConfigVersion.cmake.in \
qgpgme_debug.h qgpgme_version.h.in \
QGpgmeConfig-w32.cmake.in.in QGpgmeQt6Config.cmake.in.in \
QGpgmeQt6Config-w32.cmake.in.in QGpgmeQt6ConfigVersion.cmake.in
qgpgme_sources = \
cleaner.cpp \
dataprovider.cpp \
debug.cpp \
decryptverifyarchivejob.cpp \
decryptverifyjob.cpp \
encryptarchivejob.cpp \
filelistdataprovider.cpp \
job.cpp multideletejob.cpp qgpgmeadduseridjob.cpp \
qgpgmeaddexistingsubkeyjob.cpp \
qgpgmebackend.cpp qgpgmechangeexpiryjob.cpp qgpgmechangeownertrustjob.cpp \
qgpgmechangepasswdjob.cpp qgpgmedecryptjob.cpp \
qgpgmedecryptverifyarchivejob.cpp \
qgpgmedecryptverifyjob.cpp qgpgmedeletejob.cpp qgpgmedownloadjob.cpp \
qgpgmeencryptarchivejob.cpp \
qgpgmeencryptjob.cpp qgpgmeexportjob.cpp qgpgmeimportfromkeyserverjob.cpp \
qgpgmeimportjob.cpp qgpgmekeygenerationjob.cpp qgpgmekeylistjob.cpp \
listallkeysjob.cpp qgpgmelistallkeysjob.cpp qgpgmenewcryptoconfig.cpp \
qgpgmereceivekeysjob.cpp \
qgpgmerefreshsmimekeysjob.cpp \
qgpgmerevokekeyjob.cpp \
qgpgmesetprimaryuseridjob.cpp \
qgpgmesignarchivejob.cpp \
qgpgmesignencryptjob.cpp \
qgpgmesignencryptarchivejob.cpp \
qgpgmesignjob.cpp qgpgmesignkeyjob.cpp qgpgmeverifydetachedjob.cpp \
qgpgmeverifyopaquejob.cpp qgpgmewkdlookupjob.cpp threadedjobmixin.cpp \
qgpgmewkdrefreshjob.cpp \
qgpgmekeyformailboxjob.cpp qgpgme_debug.cpp \
qgpgmetofupolicyjob.cpp qgpgmequickjob.cpp \
defaultkeygenerationjob.cpp qgpgmewkspublishjob.cpp \
qgpgmegpgcardjob.cpp changeexpiryjob.cpp encryptjob.cpp importjob.cpp \
signarchivejob.cpp \
signencryptjob.cpp \
signencryptarchivejob.cpp \
signjob.cpp \
dn.cpp cryptoconfig.cpp wkdlookupresult.cpp \
util.cpp \
verifydetachedjob.cpp \
verifyopaquejob.cpp \
wkdrefreshjob.cpp
# If you add one here make sure that you also add one in camelcase
qgpgme_headers= \
abstractimportjob.h \
addexistingsubkeyjob.h \
adduseridjob.h \
changeexpiryjob.h \
changeownertrustjob.h \
changepasswdjob.h \
dataprovider.h \
debug.h \
decryptjob.h \
decryptverifyarchivejob.h \
decryptverifyjob.h \
downloadjob.h \
encryptarchivejob.h \
encryptjob.h \
exportjob.h \
filelistdataprovider.h \
hierarchicalkeylistjob.h \
job.h \
keyformailboxjob.h \
multideletejob.h \
protocol.h \
qgpgme_export.h \
qgpgmenewcryptoconfig.h \
quickjob.h \
receivekeysjob.h \
revokekeyjob.h \
setprimaryuseridjob.h \
specialjob.h \
signarchivejob.h \
signjob.h \
signkeyjob.h \
signencryptjob.h \
signencryptarchivejob.h \
verifyopaquejob.h \
refreshkeysjob.h \
cryptoconfig.h \
deletejob.h \
importfromkeyserverjob.h \
importjob.h \
keygenerationjob.h \
keylistjob.h \
listallkeysjob.h \
verifydetachedjob.h \
defaultkeygenerationjob.h \
tofupolicyjob.h \
wkdlookupjob.h \
wkdlookupresult.h \
wkdrefreshjob.h \
wkspublishjob.h \
gpgcardjob.h \
dn.h
camelcase_headers= \
AddExistingSubkeyJob \
AddUserIDJob \
AbstractImportJob \
ChangeExpiryJob \
ChangeOwnerTrustJob \
ChangePasswdJob \
DataProvider \
Debug \
DecryptJob \
DecryptVerifyArchiveJob \
DecryptVerifyJob \
DN \
DownloadJob \
EncryptArchiveJob \
EncryptJob \
ExportJob \
FileListDataProvider \
HierarchicalKeyKistJob \
Job \
MultiDeleteJob \
Protocol \
QGpgMENewCryptoConfig \
QuickJob \
ReceiveKeysJob \
RevokeKeyJob \
SetPrimaryUserIDJob \
SpecialJob \
SignArchiveJob \
SignJob \
SignKeyJob \
SignEncryptArchiveJob \
SignEncryptJob \
VerifyOpaqueJob \
RefreshKeysJob \
CryptoConfig \
DeleteJob \
ImportFromKeyserverJob \
ImportJob \
KeyGenerationJob \
KeyListJob \
ListAllKeysJob \
VerifyDetachedJob \
KeyForMailboxJob \
DefaultKeyGenerationJob \
WKDLookupJob \
WKDLookupResult \
WKDRefreshJob \
WKSPublishJob \
TofuPolicyJob \
GpgCardJob
private_qgpgme_headers = \
changeexpiryjob_p.h \
cleaner.h \
decryptverifyarchivejob_p.h \
decryptverifyjob_p.h \
encryptarchivejob_p.h \
encryptjob_p.h \
importjob_p.h \
listallkeysjob_p.h \
qgpgme_export.h \
protocol_p.h \
job_p.h \
qgpgmeaddexistingsubkeyjob.h \
qgpgmeadduseridjob.h \
qgpgmebackend.h \
qgpgmechangeexpiryjob.h \
qgpgmechangeownertrustjob.h \
qgpgmechangepasswdjob.h \
qgpgmedecryptjob.h \
qgpgmedecryptverifyarchivejob.h \
qgpgmedecryptverifyjob.h \
qgpgmedeletejob.h \
qgpgmedownloadjob.h \
qgpgmeencryptarchivejob.h \
qgpgmeencryptjob.h \
qgpgmeexportjob.h \
qgpgmeimportfromkeyserverjob.h \
qgpgmeimportjob.h \
qgpgmekeygenerationjob.h \
qgpgmekeylistjob.h \
qgpgmelistallkeysjob.h \
qgpgmereceivekeysjob.h \
qgpgmerefreshsmimekeysjob.h \
qgpgmerevokekeyjob.h \
qgpgmesetprimaryuseridjob.h \
qgpgmesignarchivejob.h \
qgpgmesignencryptjob.h \
qgpgmesignencryptarchivejob.h \
qgpgmesignjob.h \
qgpgmesignkeyjob.h \
qgpgmeverifydetachedjob.h \
qgpgmeverifyopaquejob.h \
qgpgmewkdlookupjob.h \
qgpgmewkdrefreshjob.h \
qgpgmekeyformailboxjob.h \
qgpgmewkspublishjob.h \
qgpgmetofupolicyjob.h \
qgpgmegpgcardjob.h \
qgpgmequickjob.h \
signarchivejob_p.h \
signencryptjob_p.h \
signencryptarchivejob_p.h \
signjob_p.h \
threadedjobmixin.h \
util.h \
verifydetachedjob_p.h \
verifyopaquejob_p.h \
wkdrefreshjob_p.h
qgpgme_moc_sources = \
abstractimportjob.moc \
addexistingsubkeyjob.moc \
adduseridjob.moc \
changeexpiryjob.moc \
changeownertrustjob.moc \
changepasswdjob.moc \
cleaner.moc \
decryptjob.moc \
decryptverifyarchivejob.moc \
decryptverifyjob.moc \
deletejob.moc \
downloadjob.moc \
encryptarchivejob.moc \
encryptjob.moc \
exportjob.moc \
hierarchicalkeylistjob.moc \
importfromkeyserverjob.moc \
importjob.moc \
job.moc \
keygenerationjob.moc \
keylistjob.moc \
listallkeysjob.moc \
multideletejob.moc \
qgpgmeaddexistingsubkeyjob.moc \
qgpgmeadduseridjob.moc \
qgpgmechangeexpiryjob.moc \
qgpgmechangeownertrustjob.moc \
qgpgmechangepasswdjob.moc \
qgpgmedecryptjob.moc \
qgpgmedecryptverifyarchivejob.moc \
qgpgmedecryptverifyjob.moc \
qgpgmedeletejob.moc \
qgpgmedownloadjob.moc \
qgpgmeencryptarchivejob.moc \
qgpgmeencryptjob.moc \
qgpgmeexportjob.moc \
qgpgmeimportfromkeyserverjob.moc \
qgpgmeimportjob.moc \
qgpgmekeygenerationjob.moc \
qgpgmekeylistjob.moc \
qgpgmelistallkeysjob.moc \
qgpgmereceivekeysjob.moc \
qgpgmerefreshsmimekeysjob.moc \
qgpgmerevokekeyjob.moc \
qgpgmesetprimaryuseridjob.moc \
qgpgmesignarchivejob.moc \
qgpgmesignencryptjob.moc \
qgpgmesignencryptarchivejob.moc \
qgpgmesignjob.moc \
qgpgmesignkeyjob.moc \
qgpgmeverifydetachedjob.moc \
qgpgmeverifyopaquejob.moc \
qgpgmewkdlookupjob.moc \
qgpgmewkdrefreshjob.moc \
qgpgmewkspublishjob.moc \
tofupolicyjob.moc \
qgpgmetofupolicyjob.moc \
receivekeysjob.moc \
refreshkeysjob.moc \
revokekeyjob.moc \
setprimaryuseridjob.moc \
signarchivejob.moc \
signencryptjob.moc \
signencryptarchivejob.moc \
signjob.moc \
signkeyjob.moc \
specialjob.moc \
verifydetachedjob.moc \
verifyopaquejob.moc \
wkdlookupjob.moc \
wkdrefreshjob.moc \
keyformailboxjob.moc \
wkspublishjob.moc \
qgpgmekeyformailboxjob.moc \
defaultkeygenerationjob.moc \
quickjob.moc \
qgpgmequickjob.moc \
gpgcardjob.moc \
qgpgmegpgcardjob.moc
if WANT_QT5
includeprefix5 = qgpgme-qt5
qgpgme5includedir = $(includedir)/$(includeprefix5)/qgpgme
qgpgme5include_HEADERS = $(qgpgme_headers)
nodist_qgpgme5include_HEADERS = qgpgme_version.h
camelcase5includedir = $(includedir)/$(includeprefix5)/QGpgME
camelcase5include_HEADERS = $(camelcase_headers)
endif
if WANT_QT6
includeprefix6 = qgpgme-qt6
qgpgme6includedir = $(includedir)/$(includeprefix6)/qgpgme
qgpgme6include_HEADERS = $(qgpgme_headers)
nodist_qgpgme6include_HEADERS = qgpgme_version.h
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 \
@LIBQGPGME_LT_CURRENT@:@LIBQGPGME_LT_REVISION@:@LIBQGPGME_LT_AGE@
endif
if HAVE_MACOS_SYSTEM
libsuffix=.dylib
else
libsuffix=.so
endif
if WANT_QT5
if HAVE_W32_SYSTEM
QGpgmeConfig.cmake: QGpgmeConfig-w32.cmake.in
sed -e 's|[@]resolved_bindir@|$(bindir)|g' < "$<" | \
sed -e 's|[@]resolved_libdir@|$(libdir)|g' | \
sed -e 's|[@]resolved_includedir@|$(includedir)/$(includeprefix)|g' > $@
else
QGpgmeConfig.cmake: QGpgmeConfig.cmake.in
sed -e 's|[@]resolved_libdir@|$(libdir)|g' < "$<" | \
sed -e 's|[@]libsuffix@|$(libsuffix)|g' | \
sed -e 's|[@]resolved_includedir@|$(includedir)/$(includeprefix)|g' > $@
endif
endif
if WANT_QT6
if HAVE_W32_SYSTEM
QGpgmeQt6Config.cmake: QGpgmeQt6Config-w32.cmake.in
sed -e 's|[@]resolved_bindir@|$(bindir)|g' < "$<" | \
sed -e 's|[@]resolved_libdir@|$(libdir)|g' | \
sed -e 's|[@]resolved_includedir@|$(includedir)/$(includeprefix)|g' > $@
else
QGpgmeQt6Config.cmake: QGpgmeQt6Config.cmake.in
sed -e 's|[@]resolved_libdir@|$(libdir)|g' < "$<" | \
sed -e 's|[@]libsuffix@|$(libsuffix)|g' | \
sed -e 's|[@]resolved_includedir@|$(includedir)/$(includeprefix)|g' > $@
endif
endif
$(camelcase_headers): Makefile.am
echo -n "#include \"qgpgme/" > "$@"
echo -n "$@" | tr '[:upper:]' '[:lower:]' >> "$@"
echo ".h\"" >> "$@"
if WANT_QT5
install-cmake-files-qt5: QGpgmeConfig.cmake QGpgmeConfigVersion.cmake
-$(INSTALL) -d $(DESTDIR)$(libdir)/cmake/QGpgme
$(INSTALL) -m 644 QGpgmeConfig.cmake \
$(DESTDIR)$(libdir)/cmake/QGpgme/QGpgmeConfig.cmake
$(INSTALL) -m 644 QGpgmeConfigVersion.cmake \
$(DESTDIR)$(libdir)/cmake/QGpgme/QGpgmeConfigVersion.cmake
install_cmake_files_qt5 = install-cmake-files-qt5
uninstall-cmake-files-qt5:
-rm $(DESTDIR)$(libdir)/cmake/QGpgme/QGpgmeConfigVersion.cmake
-rm $(DESTDIR)$(libdir)/cmake/QGpgme/QGpgmeConfig.cmake
-rmdir $(DESTDIR)$(libdir)/cmake/QGpgme/
uninstall_cmake_files_qt5 = uninstall-cmake-files-qt5
uninstall-include-dirs-qt5:
-rmdir $(DESTDIR)$(qgpgme5includedir)
-rmdir $(DESTDIR)$(camelcase5includedir)
-rmdir $(DESTDIR)$(includedir)/$(includeprefix5)
uninstall_include_dirs_qt5 = uninstall-include-dirs-qt5
endif
if WANT_QT6
install-cmake-files-qt6: QGpgmeQt6Config.cmake QGpgmeQt6ConfigVersion.cmake
-$(INSTALL) -d $(DESTDIR)$(libdir)/cmake/QGpgmeQt6
$(INSTALL) -m 644 QGpgmeQt6Config.cmake \
$(DESTDIR)$(libdir)/cmake/QGpgmeQt6/QGpgmeQt6Config.cmake
$(INSTALL) -m 644 QGpgmeQt6ConfigVersion.cmake \
$(DESTDIR)$(libdir)/cmake/QGpgmeQt6/QGpgmeQt6ConfigVersion.cmake
install_cmake_files_qt6 = install-cmake-files-qt6
uninstall-cmake-files-qt6:
-rm $(DESTDIR)$(libdir)/cmake/QGpgmeQt6/QGpgmeQt6ConfigVersion.cmake
-rm $(DESTDIR)$(libdir)/cmake/QGpgmeQt6/QGpgmeQt6Config.cmake
-rmdir $(DESTDIR)$(libdir)/cmake/QGpgmeQt6/
uninstall_cmake_files_qt6 = uninstall-cmake-files-qt6
uninstall-include-dirs-qt6:
-rmdir $(DESTDIR)$(qgpgme6includedir)
-rmdir $(DESTDIR)$(camelcase6includedir)
-rmdir $(DESTDIR)$(includedir)/$(includeprefix6)
uninstall_include_dirs_qt6 = uninstall-include-dirs-qt6
endif
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
@@ -1,159 +1,411 @@
# Makefile.am - Makefile for QGpgME tests.
# Copyright (C) 2016 Bundesamt für Sicherheit in der Informationstechnik
# Software engineering by Intevation GmbH
#
# This file is part of QGpgME.
#
# QGpgME is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# QGpgME is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, see <https://gnu.org/licenses/>.
# SPDX-License-Identifier: GPL-2.0-or-later
## Process this file with automake to produce Makefile.in
GPG = gpg
GNUPGHOME=$(abs_builddir)
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 \
-DTOP_SRCDIR="$(top_srcdir)"
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
pubring-stamp: $(top_srcdir)/tests/gpg/pubdemo.asc \
$(top_srcdir)/tests/gpg/secdemo.asc
-$(TESTS_ENVIRONMENT) gpgconf --kill all
echo "ignore-invalid-option allow-loopback-pinentry" > $(abs_builddir)/gpg-agent.conf
echo "allow-loopback-pinentry" >> gpg-agent.conf
echo "ignore-invalid-option pinentry-mode" > gpg.conf
echo "pinentry-mode loopback" >> gpg.conf
$(TESTS_ENVIRONMENT) $(GPG) --no-permission-warning \
--import $(top_srcdir)/tests/gpg/pubdemo.asc
$(TESTS_ENVIRONMENT) $(GPG) --no-permission-warning \
--passphrase "abc" \
--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
@@ -1,82 +1,83 @@
dnl qt5.m4
dnl Copyright (C) 2016 Intevation GmbH
dnl
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
AC_DEFUN([FIND_QT5],
[
have_qt5_libs="no";
PKG_CHECK_MODULES(GPGME_QT5,
Qt5Core >= 5.0.0,
[have_qt5_libs="yes"],
[have_qt5_libs="no"])
PKG_CHECK_MODULES(GPGME_QT5TEST,
Qt5Test >= 5.0.0,
[have_qt5test_libs="yes"],
[have_qt5test_libs="no"])
if ! test "$have_w32_system" = yes; then
if "$PKG_CONFIG" --variable qt_config Qt5Core | grep -q "reduce_relocations"; then
GPGME_QT5_CFLAGS="$GPGME_QT5_CFLAGS -fpic"
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])
# moc was not the qt5 one, try with moc-qt5
AC_CHECK_TOOL(MOC2, moc-qt5)
mocversion=`$MOC2 -v 2>&1`
mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc-qt5 5|moc 5"`
if test x"$mocversiongrep" != x"$mocversion"; then
AC_CHECK_TOOL(QTCHOOSER, qtchooser)
qt5tooldir=`QT_SELECT=qt5 qtchooser -print-env | grep QTTOOLDIR | cut -d '=' -f 2 | cut -d \" -f 2`
mocversion=`$qt5tooldir/moc -v 2>&1`
mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc 5"`
if test x"$mocversiongrep" != x"$mocversion"; then
# 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
if test "$have_qt5_libs" = "yes"; then
dnl Check that a binary can actually be build with this qt.
dnl pkg-config may be set up in a way that it looks also for libraries
dnl of the build system and not only for the host system. In that case
dnl we check here that we can actually compile / link a qt application
dnl for host.
OLDCPPFLAGS=$CPPFLAGS
CPPFLAGS=$GPGME_QT5_CFLAGS
OLDLIBS=$LIBS
LIBS=$GPGME_QT5_LIBS
AC_LANG_PUSH(C++)
AC_MSG_CHECKING([whether a simple qt program can be built])
AC_LINK_IFELSE([AC_LANG_SOURCE([
#include <QCoreApplication>
int main (int argc, char **argv) {
QCoreApplication app(argc, argv);
app.exec();
}])], [have_qt5_libs='yes'], [have_qt5_libs='no'])
AC_MSG_RESULT([$have_qt5_libs])
AC_LANG_POP()
CPPFLAGS=$OLDCPPFLAGS
LIBS=$OLDLIBS
fi
])
diff --git a/m4/qt6.m4 b/m4/qt6.m4
index 8a3322a7..f62a9069 100644
--- a/m4/qt6.m4
+++ b/m4/qt6.m4
@@ -1,98 +1,98 @@
dnl qt6.m4
dnl Copyright (C) 2016 Intevation GmbH
dnl
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
AC_DEFUN([FIND_QT6],
[
have_qt6_libs="no";
PKG_CHECK_MODULES(GPGME_QT6,
Qt6Core >= 6.4.0,
[have_qt6_libs="yes"],
[have_qt6_libs="no"])
PKG_CHECK_MODULES(GPGME_QT6TEST,
Qt6Test >= 6.4.0,
[have_qt6test_libs="yes"],
[have_qt6test_libs="no"])
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
fi
if test "$have_qt6_libs" = "yes"; then
if test "$have_w32_system" != yes; then
mkspecsdir=$($PKG_CONFIG --variable mkspecsdir Qt6Platform)
if test -z "$mkspecsdir"; then
AC_MSG_WARN([Failed to determine Qt's mkspecs directory. Cannot check its build configuration.])
fi
fi
# check if we need -fPIC
if test -z "$use_reduce_relocations" && test -n "$mkspecsdir"; then
AC_MSG_CHECKING([whether Qt was built with -fPIC])
if grep -q "QT_CONFIG .* reduce_relocations" $mkspecsdir/qconfig.pri; then
use_reduce_relocations="yes"
else
use_reduce_relocations="no"
fi
AC_MSG_RESULT([$use_reduce_relocations])
fi
if test "$use_reduce_relocations" = yes; then
GPGME_QT6_CFLAGS="$GPGME_QT6_CFLAGS -fPIC"
fi
# check if we need -mno-direct-extern-access
if test "$have_no_direct_extern_access" = yes; then
if test -z "$use_no_direct_extern_access" && test -n "$mkspecsdir"; then
AC_MSG_CHECKING([whether Qt was built with -mno-direct-extern-access])
if grep -q "QT_CONFIG .* no_direct_extern_access" $mkspecsdir/qconfig.pri; then
use_no_direct_extern_access="yes"
else
use_no_direct_extern_access="no"
fi
AC_MSG_RESULT([$use_no_direct_extern_access])
fi
if test "$use_no_direct_extern_access" = yes; then
GPGME_QT6_CFLAGS="$GPGME_QT6_CFLAGS -mno-direct-extern-access"
fi
fi
dnl Check that a binary can actually be build with this qt.
dnl pkg-config may be set up in a way that it looks also for libraries
dnl of the build system and not only for the host system. In that case
dnl we check here that we can actually compile / link a qt application
dnl for host.
OLDCPPFLAGS=$CPPFLAGS
OLDLIBS=$LIBS
CPPFLAGS=$GPGME_QT6_CFLAGS
LIBS=$GPGME_QT6_LIBS
AC_LANG_PUSH(C++)
AC_MSG_CHECKING([whether a simple Qt program can be built])
AC_LINK_IFELSE([AC_LANG_SOURCE([
#include <QCoreApplication>
int main (int argc, char **argv) {
QCoreApplication app(argc, argv);
app.exec();
}])], [have_qt6_libs='yes'], [have_qt6_libs='no'])
AC_MSG_RESULT([$have_qt6_libs])
AC_LANG_POP()
CPPFLAGS=$OLDCPPFLAGS
LIBS=$OLDLIBS
fi
])

File Metadata

Mime Type
text/x-diff
Expires
Mon, May 12, 6:49 PM (16 h, 15 s)
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
a4/dd/bfe5eb32e19309d26167ec16a0ab

Event Timeline