Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 02:36:34 +01:00
Code Releases Activity

Make it possible to override FALKON_PLUGIN_PATH from cache

Browse Source
This commit is contained in:
David Rosca 2018-02-11 09:03:46 +01:00
parent 3e1e49f3d3
commit c90e0fefd7
No known key found for this signature in database
GPG Key ID: EBC3FC294452C6D8
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -31,10 +31,11 @@ else()
set(FALKON_INSTALL_PLUGINDIR "${KDE_INSTALL_PLUGINDIR}") set(FALKON_INSTALL_PLUGINDIR "${KDE_INSTALL_PLUGINDIR}")
endif() endif()
if (IS_ABSOLUTE ${FALKON_INSTALL_PLUGINDIR}) if (IS_ABSOLUTE ${FALKON_INSTALL_PLUGINDIR})
set(FALKON_PLUGIN_PATH "${FALKON_INSTALL_PLUGINDIR}") set(PLUGIN_PATH "${FALKON_INSTALL_PLUGINDIR}")
else() else()
set(FALKON_PLUGIN_PATH "${CMAKE_INSTALL_PREFIX}/${FALKON_INSTALL_PLUGINDIR}") set(PLUGIN_PATH "${CMAKE_INSTALL_PREFIX}/${FALKON_INSTALL_PLUGINDIR}")
endif() endif()
set(FALKON_PLUGIN_PATH "${PLUGIN_PATH}" CACHE PATH "Default plugin search path")
# Defines that are always set # Defines that are always set
add_definitions(-DQT_NO_URL_CAST_FROM_STRING -DQT_USE_QSTRINGBUILDER -DQT_NO_CAST_TO_ASCII) add_definitions(-DQT_NO_URL_CAST_FROM_STRING -DQT_USE_QSTRINGBUILDER -DQT_NO_CAST_TO_ASCII)

2
config.h.cmake
View File

@ -1,7 +1,7 @@
/* config.h. Generated by cmake from config.h.cmake */ /* config.h. Generated by cmake from config.h.cmake */
#define FALKON_VERSION "${PROJECT_VERSION}" #define FALKON_VERSION "${PROJECT_VERSION}"
#define FALKON_PLUGIN_PATH "${FALKON_PLUGIN_PATH}" #cmakedefine FALKON_PLUGIN_PATH "${FALKON_PLUGIN_PATH}"
#cmakedefine FALKON_GIT_REVISION "${FALKON_GIT_REVISION}" #cmakedefine FALKON_GIT_REVISION "${FALKON_GIT_REVISION}"
/* Enable portable build */ /* Enable portable build */

2
src/lib/app/datapaths.cpp
View File

@ -87,7 +87,9 @@ void DataPaths::init()
{ {
m_paths[AppData].append(QStandardPaths::standardLocations(QStandardPaths::AppDataLocation)); m_paths[AppData].append(QStandardPaths::standardLocations(QStandardPaths::AppDataLocation));
#ifdef FALKON_PLUGIN_PATH
m_paths[Plugins].append(QStringLiteral(FALKON_PLUGIN_PATH)); m_paths[Plugins].append(QStringLiteral(FALKON_PLUGIN_PATH));
#endif
for (const QString &location : qAsConst(m_paths[AppData])) { for (const QString &location : qAsConst(m_paths[AppData])) {
initAssetsIn(location); initAssetsIn(location);