Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-13 10:32:11 +01:00
Code Releases Activity

Remove no longer working USE_LIBPATH build option

Browse Source
This commit is contained in:
David Rosca 2017-10-27 13:32:42 +02:00
parent 86ebe85aa7
commit d3f4b59d66
3 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
BUILDING.md
View File

@ -105,13 +105,6 @@ Available Defines
example: example:
$ export NO_X11="true" $ export NO_X11="true"
USE_LIBPATH By default, /usr/lib/ is used for libFalkon and /usr/lib/falkon
for plugins.
You can change it by setting this define.
example:
$ export USE_LIBPATH="/usr/lib64"
NO_SYSTEM_DATAPATH By default, Falkon is using /usr/share/falkon/ path NO_SYSTEM_DATAPATH By default, Falkon is using /usr/share/falkon/ path
for storing themes and translations. for storing themes and translations.
By setting this define, Falkon will use path of execution. By setting this define, Falkon will use path of execution.

6
CMakeLists.txt
View File

@ -48,10 +48,6 @@ option(NONBLOCK_JS_DIALOGS "TODO" OFF)
if (NONBLOCK_JS_DIALOGS) if (NONBLOCK_JS_DIALOGS)
add_definitions(-DNONBLOCK_JS_DIALOGS) add_definitions(-DNONBLOCK_JS_DIALOGS)
endif() endif()
option(USE_LIBPATH "TODO" "") # REMOVE?
if (USE_LIBPATH)
add_definitions(-DUSE_LIBPATH=\"${USE_LIBPATH}\")
endif()
option(DISABLE_DBUS "TODO" OFF) option(DISABLE_DBUS "TODO" OFF)
if (DISABLE_DBUS) if (DISABLE_DBUS)
add_definitions(-DDISABLE_DBUS) add_definitions(-DDISABLE_DBUS)
@ -61,7 +57,7 @@ if (DISABLE_UPDATES_CHECK)
add_definitions(-DDISABLE_UPDATES_CHECK) add_definitions(-DDISABLE_UPDATES_CHECK)
endif() endif()
# Note: the old qmake option DEBUG_BUILD is now -DCMAKE_BUILD_TYPE=Debug, and FALKON_PREFIX is now -DCMAKE_INSTALL_PREFIX # Note: the old qmake option DEBUG_BUILD is now -DCMAKE_BUILD_TYPE=Debug, and FALKON_PREFIX is now -DCMAKE_INSTALL_PREFIX
# SHARE_FOLDER is now auto-detected, so is USE_LIBPATH. # SHARE_FOLDER is now auto-detected.
# Mandatory: Qt5 # Mandatory: Qt5
set(QT_MIN_VERSION "5.8.0") set(QT_MIN_VERSION "5.8.0")

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

@ -115,10 +115,6 @@ void DataPaths::init()
QDir dir; QDir dir;
dir.mkpath(m_paths[Config].at(0)); dir.mkpath(m_paths[Config].at(0));
dir.mkpath(m_paths[Temp].at(0)); dir.mkpath(m_paths[Temp].at(0));
#ifdef USE_LIBPATH
m_paths[Plugins].append(QLatin1String(USE_LIBPATH "/falkon"));
#endif
} }
void DataPaths::initCurrentProfile(const QString &profilePath) void DataPaths::initCurrentProfile(const QString &profilePath)