Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit a51af6f9 authored by Boudewijn Rempt's avatar Boudewijn Rempt

Install plugins to a krita plugin dir

parent ca8cecdd
......@@ -299,8 +299,8 @@ if(WIN32)
set(WIN32_PLATFORM_NET_LIBS ws2_32.lib netapi32.lib)
endif()
# set custom calligra plugin installdir
set(CALLIGRA_PLUGIN_INSTALL_DIR ${LIB_INSTALL_DIR}/calligra)
# set custom krita plugin installdir
set(CALLIGRA_PLUGIN_INSTALL_DIR ${LIB_INSTALL_DIR}/krita)
# TEMPORARY: for initial Qt5/KF5 build porting phase deprecation warnings are only annoying noise
# remove once code porting phase starts, perhaps first locally in product subdirs
......
......@@ -63,9 +63,9 @@ QList<QPluginLoader *> KoJsonTrader::query(const QString &servicetype, const QSt
if (info.isDir() && info.fileName().contains("lib")) {
QDir libDir(info.absoluteFilePath());
// on many systems this will be the actual lib dir (and calligra subdir contains plugins)
if (libDir.entryList(QStringList() << "calligra").size() > 0) {
m_pluginPath = info.absoluteFilePath() + "/calligra";
// on many systems this will be the actual lib dir (and krita subdir contains plugins)
if (libDir.entryList(QStringList() << "krita").size() > 0) {
m_pluginPath = info.absoluteFilePath() + "/krita";
break;
}
......@@ -74,8 +74,8 @@ QList<QPluginLoader *> KoJsonTrader::query(const QString &servicetype, const QSt
foreach(QString subEntry, libDir.entryList()) {
QFileInfo subInfo(libDir, subEntry);
if (subInfo.isDir()) {
if (QDir(subInfo.absoluteFilePath()).entryList(QStringList() << "calligra").size() > 0) {
m_pluginPath = subInfo.absoluteFilePath() + "/calligra";
if (QDir(subInfo.absoluteFilePath()).entryList(QStringList() << "krita").size() > 0) {
m_pluginPath = subInfo.absoluteFilePath() + "/krita";
break; // will only break inner loop so we need the extra check below
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment