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

OS/2 + Windows: Don't build KDE/Gnome password plugins.

Browse Source 
OS/2: Correctly link to libcrypto
BUILDING: Make a note about gdb being requirement for debug build
This commit is contained in:
nowrep 2014-01-27 22:30:55 +01:00
parent 5f2948dadd
commit 0d2db81ffa
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BUILDING
View File

@ -45,6 +45,8 @@ Linux / Unix
- kdelibs-dev installed - kdelibs-dev installed
- set KDE_INTEGRATION build flag - set KDE_INTEGRATION build flag
For debug build, gdb is required by qmake.
MAC OS X MAC OS X
---------------------------------------------------------------------------------- ----------------------------------------------------------------------------------

2
src/lib/lib.pro
View File

@ -521,7 +521,7 @@ win32 {
} }
os2 { os2 {
LIBS += -llibeay32 LIBS += -lcrypto
} }
mac { mac {

24
src/plugins/plugins.pro
View File

@ -9,7 +9,7 @@ defineTest(addSubdir) {
fullPath = $$replace(entry, ;,"") fullPath = $$replace(entry, ;,"")
fullPath = $$replace(fullPath, \\\\, /) fullPath = $$replace(fullPath, \\\\, /)
name = $$replace(fullPath, $$re_escape("$$subdir/"), "") name = $$replace(fullPath, $$re_escape("$$subdir/"), "")
win32: fullPath = $$lower($$fullPath) os2|win32: fullPath = $$lower($$fullPath)
exists($$fullPath/*.pro): SUBDIRS += $$fullPath exists($$fullPath/*.pro): SUBDIRS += $$fullPath
} }
} }
@ -17,23 +17,23 @@ defineTest(addSubdir) {
export (SUBDIRS) export (SUBDIRS)
} }
defineTest(disablePlugin) {
SUBDIRS -= $$PWD/$$1
os2|win32: SUBDIRS -= $$lower($$PWD/$$1)
export(SUBDIRS)
}
addSubdir($$PWD) addSubdir($$PWD)
outOfDirPlugins = $$(QUPZILLA_PLUGINS_SRCDIR) outOfDirPlugins = $$(QUPZILLA_PLUGINS_SRCDIR)
!equals(outOfDirPlugins, "") : addSubdir($$(QUPZILLA_PLUGINS_SRCDIR)) !equals(outOfDirPlugins, ""): addSubdir($$(QUPZILLA_PLUGINS_SRCDIR))
# TestPlugin only in debug build # TestPlugin only in debug build
!CONFIG(debug, debug|release): SUBDIRS -= $$PWD/TestPlugin !CONFIG(debug, debug|release): disablePlugin(TestPlugin)
# KWalletPasswords only with KDE_INTEGRATION # KWalletPasswords only with KDE_INTEGRATION
!contains(DEFINES, KDE_INTEGRATION): SUBDIRS -= $$PWD/KWalletPasswords !contains(DEFINES, KDE_INTEGRATION) | equals(QT_MAJOR_VERSION, 5): disablePlugin(KWalletPasswords)
!lessThan(QT_VERSION, 5.0): SUBDIRS -= $$PWD/KWalletPasswords
# GnomeKeyringPasswords only with GNOME_INTEGRATION # GnomeKeyringPasswords only with GNOME_INTEGRATION
!contains(DEFINES, GNOME_INTEGRATION): SUBDIRS -= $$PWD/GnomeKeyringPasswords !contains(DEFINES, GNOME_INTEGRATION) | !system(pkg-config --exists gnome-keyring-1): disablePlugin(GnomeKeyringPasswords)
!system(pkg-config --exists gnome-keyring-1): SUBDIRS -= $$PWD/GnomeKeyringPasswords
!unix|mac {
SUBDIRS -= $$lower($$PWD/KWalletPasswords)
SUBDIRS -= $$lower($$PWD/GnomeKeyringPasswords)
}