diff options
| author | Pekka Vuorela <pvuorela@iki.fi> | 2025-11-02 13:06:00 +0200 |
|---|---|---|
| committer | Pekka Vuorela <pvuorela@iki.fi> | 2025-11-11 11:33:34 +0200 |
| commit | 83372ffcf8526b4a0a405be8fef1e3d102c26155 (patch) | |
| tree | 8f48bd520a1aa6f57cfe09a97a83ae233431f237 /src | |
| parent | ced6584c65498661db5012602b0465e293476da0 (diff) | |
Adjust installation paths
Install headers and plugins to qt6 directory as it should have been
long time already. Didn't touch .pro files as those don't work with
current qt6 and are used more with qt5 build.
Use common common 'messagingframework' container dir for
plugins. The plugin type directly under qt plugins dir was confusing,
and possibly even colliding with other qt plugins. Crypto at least seems
used by qt itself.
Change-Id: I2c674ba184a53d602dc2a1fc24f83a955268a166
Reviewed-by: <matti.viljanen@kapsi.fi>
Reviewed-by: Damien Caliste <dcaliste@free.fr>
Reviewed-by: Pekka Vuorela <pvuorela@iki.fi>
Diffstat (limited to 'src')
19 files changed, 25 insertions, 22 deletions
diff --git a/src/libraries/qmfclient/CMakeLists.txt b/src/libraries/qmfclient/CMakeLists.txt index 9f1edbaa..1ce63a82 100644 --- a/src/libraries/qmfclient/CMakeLists.txt +++ b/src/libraries/qmfclient/CMakeLists.txt @@ -169,8 +169,8 @@ endif() install(TARGETS QmfClient LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/qt5/QmfClient - PRIVATE_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/qt5/QmfClient/private) + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/qt6/QmfClient + PRIVATE_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/qt6/QmfClient/private) if (TARGET Qt6::LinguistTools) qt_add_translations(libqmfclient) diff --git a/src/libraries/qmfclient/qmfclient.pro b/src/libraries/qmfclient/qmfclient.pro index 674799f7..1a5e0dea 100644 --- a/src/libraries/qmfclient/qmfclient.pro +++ b/src/libraries/qmfclient/qmfclient.pro @@ -3,8 +3,8 @@ QT = core dbus sql network core5compat CONFIG += warn_on MODULE_PLUGIN_TYPES = \ - contentmanagers \ - crypto + messagingframework/contentmanagers \ + messagingframework/crypto load(qt_module) CONFIG -= create_cmake diff --git a/src/libraries/qmfclient/support/qmailpluginmanager.cpp b/src/libraries/qmfclient/support/qmailpluginmanager.cpp index 0b5c29d2..2669d209 100644 --- a/src/libraries/qmfclient/support/qmailpluginmanager.cpp +++ b/src/libraries/qmfclient/support/qmailpluginmanager.cpp @@ -119,7 +119,10 @@ public: QMailPluginManagerPrivate::QMailPluginManagerPrivate(const QString &subdir) { - QStringList libraryPaths = QCoreApplication::libraryPaths(); + QStringList libraryPaths; + for (const QString &path : QCoreApplication::libraryPaths()) { + libraryPaths.append(path + "/messagingframework"); + } foreach (QString libraryPath, libraryPaths) { QDir dir(libraryPath); diff --git a/src/libraries/qmfmessageserver/CMakeLists.txt b/src/libraries/qmfmessageserver/CMakeLists.txt index ac5d26ad..387fb907 100644 --- a/src/libraries/qmfmessageserver/CMakeLists.txt +++ b/src/libraries/qmfmessageserver/CMakeLists.txt @@ -50,4 +50,4 @@ set_target_properties(QmfMessageServer PROPERTIES install(TARGETS QmfMessageServer LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/qt5/QmfMessageServer) + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/qt6/QmfMessageServer) diff --git a/src/libraries/qmfmessageserver/qmfmessageserver.pro b/src/libraries/qmfmessageserver/qmfmessageserver.pro index 835cf03d..b6ef3cb4 100644 --- a/src/libraries/qmfmessageserver/qmfmessageserver.pro +++ b/src/libraries/qmfmessageserver/qmfmessageserver.pro @@ -3,8 +3,8 @@ QT = core network qmfclient qmfclient-private CONFIG += warn_on MODULE_PLUGIN_TYPES = \ - messageservices \ - messagecredentials + messagingframework/messageservices \ + messagingframework/messagecredentials contains(DEFINES,MESSAGESERVER_PLUGINS) { MODULE_PLUGIN_TYPES += messageserverplugins diff --git a/src/libraries/qmfwidgets/CMakeLists.txt b/src/libraries/qmfwidgets/CMakeLists.txt index 82a07a52..88843c3c 100644 --- a/src/libraries/qmfwidgets/CMakeLists.txt +++ b/src/libraries/qmfwidgets/CMakeLists.txt @@ -31,7 +31,7 @@ set_target_properties(QmfWidgets PROPERTIES install(TARGETS QmfWidgets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/qt5/QmfWidgets) + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/qt6/QmfWidgets) if (TARGET Qt6::LinguistTools) qt_add_translations(libqmfwidgets) diff --git a/src/plugins/contentmanagers/qmfstoragemanager/CMakeLists.txt b/src/plugins/contentmanagers/qmfstoragemanager/CMakeLists.txt index 5161d1ce..5822d165 100644 --- a/src/plugins/contentmanagers/qmfstoragemanager/CMakeLists.txt +++ b/src/plugins/contentmanagers/qmfstoragemanager/CMakeLists.txt @@ -5,7 +5,7 @@ target_link_libraries(qmfstoragemanager PRIVATE Qt6::Core QmfClient) install(TARGETS qmfstoragemanager - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/qt5/plugins/contentmanagers) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/qt6/plugins/messagingframework/contentmanagers) if(BUILD_TESTING) add_custom_target(link_qmfstoragemanager ALL diff --git a/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.pro b/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.pro index 60fdd366..bfe7c778 100644 --- a/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.pro +++ b/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.pro @@ -1,6 +1,6 @@ TEMPLATE = lib TARGET = qmfstoragemanager -PLUGIN_TYPE = contentmanagers +PLUGIN_TYPE = messagingframework/contentmanagers PLUGIN_CLASS_NAME = QmfStorageManagerPlugin load(qt_plugin) QT = core qmfclient diff --git a/src/plugins/credentials/sso/sso.pro b/src/plugins/credentials/sso/sso.pro index 9abae1c7..b6e85668 100644 --- a/src/plugins/credentials/sso/sso.pro +++ b/src/plugins/credentials/sso/sso.pro @@ -1,6 +1,6 @@ TEMPLATE = lib TARGET = sso -PLUGIN_TYPE = messagecredentials +PLUGIN_TYPE = messagingframework/messagecredentials load(qt_plugin) QT = core qmfclient qmfmessageserver diff --git a/src/plugins/crypto/gpgme/CMakeLists.txt b/src/plugins/crypto/gpgme/CMakeLists.txt index 3e8eaed6..1c9fa857 100644 --- a/src/plugins/crypto/gpgme/CMakeLists.txt +++ b/src/plugins/crypto/gpgme/CMakeLists.txt @@ -7,7 +7,7 @@ target_link_libraries(gpgme PRIVATE Qt6::Core QmfClient ${GPGME_LIBS}) install(TARGETS gpgme - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/qt5/plugins/crypto) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/qt6/plugins/messagingframework/crypto) if(BUILD_TESTING) add_custom_target(link_gpgme ALL diff --git a/src/plugins/crypto/gpgme/gpgme.pro b/src/plugins/crypto/gpgme/gpgme.pro index 90b3435f..dcfcaae4 100644 --- a/src/plugins/crypto/gpgme/gpgme.pro +++ b/src/plugins/crypto/gpgme/gpgme.pro @@ -1,6 +1,6 @@ TEMPLATE = lib TARGET = gpgme -PLUGIN_TYPE = crypto +PLUGIN_TYPE = messagingframework/crypto PLUGIN_CLASS_NAME = QMailCryptoGpgmePlugin load(qt_plugin) QT = core qmfclient diff --git a/src/plugins/crypto/smime/CMakeLists.txt b/src/plugins/crypto/smime/CMakeLists.txt index b63b881b..1085ae87 100644 --- a/src/plugins/crypto/smime/CMakeLists.txt +++ b/src/plugins/crypto/smime/CMakeLists.txt @@ -7,7 +7,7 @@ target_link_libraries(smime PRIVATE Qt6::Core QmfClient ${GPGME_LIBS}) install(TARGETS smime - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/qt5/plugins/crypto) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/qt6/plugins/messagingframework/crypto) if(BUILD_TESTING) add_custom_target(link_smime ALL diff --git a/src/plugins/crypto/smime/smime.pro b/src/plugins/crypto/smime/smime.pro index 80e9d53d..b640745d 100644 --- a/src/plugins/crypto/smime/smime.pro +++ b/src/plugins/crypto/smime/smime.pro @@ -1,6 +1,6 @@ TEMPLATE = lib TARGET = smime -PLUGIN_TYPE = crypto +PLUGIN_TYPE = messagingframework/crypto PLUGIN_CLASS_NAME = QMailCryptoSmimePlugin load(qt_plugin) QT = core qmfclient diff --git a/src/plugins/messageservices/imap/CMakeLists.txt b/src/plugins/messageservices/imap/CMakeLists.txt index 3f32e0ca..60c339ea 100644 --- a/src/plugins/messageservices/imap/CMakeLists.txt +++ b/src/plugins/messageservices/imap/CMakeLists.txt @@ -49,7 +49,7 @@ else() endif() install(TARGETS imap - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/qt5/plugins/messageservices) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/qt6/plugins/messagingframework/messageservices) if(BUILD_TESTING) add_custom_target(link_imap ALL diff --git a/src/plugins/messageservices/imap/imap.pro b/src/plugins/messageservices/imap/imap.pro index 9e92fe13..0e1c7c78 100644 --- a/src/plugins/messageservices/imap/imap.pro +++ b/src/plugins/messageservices/imap/imap.pro @@ -1,6 +1,6 @@ TEMPLATE = lib TARGET = imap -PLUGIN_TYPE = messageservices +PLUGIN_TYPE = messagingframework/messageservices PLUGIN_CLASS_NAME = QmfImapPlugin load(qt_plugin) diff --git a/src/plugins/messageservices/pop/CMakeLists.txt b/src/plugins/messageservices/pop/CMakeLists.txt index edb41041..33294c70 100644 --- a/src/plugins/messageservices/pop/CMakeLists.txt +++ b/src/plugins/messageservices/pop/CMakeLists.txt @@ -33,7 +33,7 @@ else() endif() install(TARGETS pop - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/qt5/plugins/messageservices) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/qt6/plugins/messagingframework/messageservices) if(BUILD_TESTING) add_custom_target(link_pop ALL diff --git a/src/plugins/messageservices/pop/pop.pro b/src/plugins/messageservices/pop/pop.pro index 388330ce..549d0329 100644 --- a/src/plugins/messageservices/pop/pop.pro +++ b/src/plugins/messageservices/pop/pop.pro @@ -1,6 +1,6 @@ TEMPLATE = lib TARGET = pop -PLUGIN_TYPE = messageservices +PLUGIN_TYPE = messagingframework/messageservices PLUGIN_CLASS_NAME = QmfPopPlugin load(qt_plugin) diff --git a/src/plugins/messageservices/smtp/CMakeLists.txt b/src/plugins/messageservices/smtp/CMakeLists.txt index e69d6236..62eccec9 100644 --- a/src/plugins/messageservices/smtp/CMakeLists.txt +++ b/src/plugins/messageservices/smtp/CMakeLists.txt @@ -31,7 +31,7 @@ else() endif() install(TARGETS smtp - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/qt5/plugins/messageservices) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/qt6/plugins/messagingframework/messageservices) if(BUILD_TESTING) add_custom_target(link_smtp ALL diff --git a/src/plugins/messageservices/smtp/smtp.pro b/src/plugins/messageservices/smtp/smtp.pro index bcae20cd..d74447ce 100644 --- a/src/plugins/messageservices/smtp/smtp.pro +++ b/src/plugins/messageservices/smtp/smtp.pro @@ -1,6 +1,6 @@ TEMPLATE = lib TARGET = smtp -PLUGIN_TYPE = messageservices +PLUGIN_TYPE = messagingframework/messageservices PLUGIN_CLASS_NAME = QmfSmtpPlugin load(qt_plugin) |