1
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-24 04:36:34 +01:00

Added option to change path to install library on Linux.

- read BUILDING - define USE_LIBPATH
This commit is contained in:
nowrep 2012-04-02 21:05:06 +02:00
parent f0f875082a
commit 0142c3ba9f
4 changed files with 53 additions and 36 deletions

View File

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

View File

@ -29,6 +29,7 @@ d_kde = $$(KDE)
d_portable = $$(PORTABLE_BUILD)
d_nonblock_dialogs = $$(NONBLOCK_JS_DIALOGS)
d_use_qtwebkit_2_2 = $$(USE_QTWEBKIT_2_2)
d_use_lib_path = $$(USE_LIB_PATH)
equals(d_no_system_datapath, "true") { DEFINES *= NO_SYSTEM_DATAPATH }
equals(d_use_webgl, "true") { DEFINES *= USE_WEBGL }
@ -56,6 +57,11 @@ equals(d_use_qtwebkit_2_2, "true") { DEFINES *= USE_QTWEBKIT_2_2 }
hicolor_folder = "$$d_prefix"share/icons/hicolor
}
!equals(d_use_lib_path, "") {
library_folder = $$d_use_lib_path
DEFINES *= USE_LIBPATH=\\\"""$$d_use_lib_path/"\\\""
}
DEFINES *= USE_DATADIR=\\\"""$$data_folder/"\\\""
#Git revision

View File

@ -159,7 +159,11 @@ void Plugins::loadAvailablePlugins()
QStringList dirs;
dirs << mApp->DATADIR + "plugins/"
#ifdef Q_WS_X11
#ifdef USE_LIBPATH
<< USE_LIBPATH
#else
<< "/usr/lib/qupzilla/"
#endif
#endif
<< mApp->PROFILEDIR + "plugins/";

View File

@ -1021,7 +1021,7 @@
<location filename="../src/lib/other/clearprivatedata.ui" line="140"/>
<source>Clear web databases</source>
<translatorcomment>Z czasem poprawić. Jakieś sugestie?</translatorcomment>
<translation type="unfinished">Wyczyść bazy danych www</translation>
<translation>Wyczyść bazy danych www</translation>
</message>
<message>
<location filename="../src/lib/other/clearprivatedata.ui" line="150"/>