Added option to change path to install library on Linux.

- read BUILDING - define USE_LIBPATH
remotes/origin/falkon
nowrep 14 years ago
parent f0f875082a
commit 0142c3ba9f
  1. 7
      BUILDING
  2. 6
      src/defines.pri
  3. 4
      src/lib/plugins/plugins.cpp
  4. 2
      translations/pl_PL.ts

@ -122,6 +122,13 @@ Available Defines
example: example:
$ export KDE="true" $ 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 NO_SYSTEM_DATAPATH By default, QupZilla is using /usr/share/qupzilla/ path
for storing themes, translations and plugins. for storing themes, translations and plugins.
By setting this define, QupZilla will use path of execution. By setting this define, QupZilla will use path of execution.

@ -29,6 +29,7 @@ d_kde = $$(KDE)
d_portable = $$(PORTABLE_BUILD) d_portable = $$(PORTABLE_BUILD)
d_nonblock_dialogs = $$(NONBLOCK_JS_DIALOGS) d_nonblock_dialogs = $$(NONBLOCK_JS_DIALOGS)
d_use_qtwebkit_2_2 = $$(USE_QTWEBKIT_2_2) 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_no_system_datapath, "true") { DEFINES *= NO_SYSTEM_DATAPATH }
equals(d_use_webgl, "true") { DEFINES *= USE_WEBGL } 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 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/"\\\"" DEFINES *= USE_DATADIR=\\\"""$$data_folder/"\\\""
#Git revision #Git revision

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

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

Loading…
Cancel
Save