diff options
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | lang/qt/src/Makefile.am | 18 |
2 files changed, 14 insertions, 6 deletions
@@ -14,6 +14,8 @@ Noteworthy changes in version 1.24.0 (unrelease) * cpp: Provide information about designated revocation keys for a Key. [T7118] + * qt: Install headers for Qt 5 and Qt 6 in separate folders. [T7161] + * qt: Allow reading the data to decrypt/encrypt/sign/verify directly from files. [T6550] diff --git a/lang/qt/src/Makefile.am b/lang/qt/src/Makefile.am index 3a543b27..de0d7b05 100644 --- a/lang/qt/src/Makefile.am +++ b/lang/qt/src/Makefile.am @@ -319,9 +319,15 @@ qgpgme_moc_sources = \ gpgcardjob.moc \ qgpgmegpgcardjob.moc -qgpgmeincludedir = $(includedir)/qgpgme +if WANT_QT5 +includeprefix = qgpgme-qt5 +endif +if WANT_QT6 +includeprefix = qgpgme-qt6 +endif +qgpgmeincludedir = $(includedir)/$(includeprefix)/qgpgme qgpgmeinclude_HEADERS = $(qgpgme_headers) -camelcaseincludedir = $(includedir)/QGpgME +camelcaseincludedir = $(includedir)/$(includeprefix)/QGpgME camelcaseinclude_HEADERS = $(camelcase_headers) nodist_qgpgmeinclude_HEADERS = qgpgme_version.h @@ -363,12 +369,12 @@ 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)|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)|g' > $@ + sed -e 's|[@]resolved_includedir@|$(includedir)/$(includeprefix)|g' > $@ endif endif if WANT_QT6 @@ -376,12 +382,12 @@ 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)|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)|g' > $@ + sed -e 's|[@]resolved_includedir@|$(includedir)/$(includeprefix)|g' > $@ endif endif |