Merge branch 'aarch64-fix' into 'master'

[buteo-syncfw] Fix plugin path for aarch64. JB#51189 See merge request mer-core/buteo-syncfw!52
sailfishos · Sep 14, 2020 · 19ca0e2 · 19ca0e2
2 parents f86f7ca + b84ebc2
commit 19ca0e2
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 11 deletions.
diff --git a/doc/doc.pri b/doc/doc.pri
@@ -9,7 +9,7 @@ doc.depends = FORCE
 
 QMAKE_CLEAN += $${PWD}/html/* $${PWD}/buteo-syncfw.tag
 
-htmldocs.files = $${PWD}/html/*
+htmldocs.files = $${PWD}/html/
 htmldocs.path = /usr/share/doc/buteo-syncfw-doc/
 htmldocs.CONFIG += no_check_exist
 

diff --git a/doc/src/plugin-guide.dox b/doc/src/plugin-guide.dox
@@ -66,7 +66,7 @@ to a binary executable plugin
 
 TEMPLATE = app
 QT += dbus
-target.path = /usr/lib/buteo-plugins-qt5/oopp
+target.path = $$[QT_INSTALL_LIBS]/buteo-plugins-qt5/oopp
 
 DEFINES += "CLASSNAME=MyPluginClassname"
 DEFINES += CLASSNAME_H=\\\"MyPluginClassname.h\\\"

diff --git a/libbuteosyncfw/libbuteosyncfw.pro b/libbuteosyncfw/libbuteosyncfw.pro
@@ -16,6 +16,8 @@ CONFIG += dll \
 
 #DEFINES += BUTEO_ENABLE_DEBUG
 
+DEFINES += DEFAULT_PLUGIN_PATH=\"\\\"$$[QT_INSTALL_LIBS]/buteo-plugins-qt5\\\"\"
+
 # Input
 HEADERS += common/Logger.h \
            common/LogMacros.h \
@@ -98,10 +100,7 @@ QMAKE_CLEAN += $(OBJECTS_DIR)/moc_*
 QMAKE_CLEAN += lib$${TARGET}.prl pkgconfig/*
 
 # install
-isEmpty(LIBDIR) {
-    LIBDIR = /usr/lib
-}
-target.path = $${LIBDIR}
+target.path = $$[QT_INSTALL_LIBS]
 headers.path = /usr/include/buteosyncfw5/
 sources.path = $$headers.path
 

diff --git a/libbuteosyncfw/pluginmgr/PluginManager.cpp b/libbuteosyncfw/pluginmgr/PluginManager.cpp
@@ -51,9 +51,6 @@ const QString STORAGECHANGENOTIFIERMAP_LOCATION = "-changenotifier.so";
 const QString OOP_CLIENT_SUFFIX = "-client";
 const QString OOP_SERVER_SUFFIX = "-server";
 
-// Default directory from which to look for plugins
-const QString DEFAULT_PLUGIN_PATH = "/usr/lib/buteo-plugins-qt5/";
-
 // The name of the function which is used to create a plugin
 const QString CREATE_FUNCTION = "createPlugin";
 
@@ -64,7 +61,7 @@ const QString DESTROY_FUNCTION = "destroyPlugin";
 using namespace Buteo;
 
 PluginManager::PluginManager()
-    : PluginManager(DEFAULT_PLUGIN_PATH)
+    : PluginManager(QStringLiteral(DEFAULT_PLUGIN_PATH))
 {
 }
 

diff --git a/tools/templates/myproj_pro.tmpl b/tools/templates/myproj_pro.tmpl
@@ -6,7 +6,7 @@ INCLUDEPATH += .
 CONFIG += link_pkgconfig plugin
 
 PKGCONFIG = buteosyncfw5
-target.path = /usr/lib/buteo-plugins-qt5
+target.path = $$[QT_INSTALL_LIBS]/buteo-plugins-qt5
 
 QT += dbus sql network
 QT -= gui