gpgme/m4/qt5.m4, branch gpgme-1.24.0 GnuPG Made Easy. http://git.bktus.com/gpgfrontend/gpgme/atom?h=gpgme-1.24.0 2024-07-18T12:41:52Z build,qt: Decouple generation of moc files 2024-07-18T12:41:52Z Ingo Klöcker dev@ingo-kloecker.de 2024-07-17T12:06:52Z urn:sha1:e6830b58b6de6d4fa02f1055cd0e992c9310b51a * 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 build,qt: Fail check for Qt if moc wasn't found 2022-10-14T12:02:26Z Ingo Klöcker dev@ingo-kloecker.de 2022-10-14T12:02:26Z urn:sha1:1792db58346cb39fd99332478d56dc190bae7836 * m4/qt5.m4, m4/qt6.m4: Perform build test only if moc was found. -- If moc wasn't found but the build test (which doesn't require moc) succeeded, then success was reported. build,qt: Explicitly namespace a few Qt variables for Qt5 2022-10-10T12:46:39Z Ingo Klöcker dev@ingo-kloecker.de 2022-10-10T12:30:41Z urn:sha1:8e908029ffa03d21662030d3111dcf556b722e1a m4/qt.m4: Rename to m4/qt5.m4: this. (FIND_QT): Rename to FIND_QT5. (GPGME_QT): Change variable prefix to GPGME_QT5. (GPGME_QTTEST: Change variable prefix to GPGME_QT5TEST. configure.ac, lang/qt/src/Makefile.am, lang/qt/tests/Makefile.am: Adjust accordingly. -- In preparation to adding support for building qgpgme for Qt6, add the version number to a few variables to avoid confusion.