1
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-11 01:22:10 +01:00

Fix compilation on Linux + update build requirements

This commit is contained in:
nowrep 2013-06-21 11:09:19 +02:00
parent 3170fccf0e
commit 0927bf0cb7
3 changed files with 10 additions and 3 deletions

View File

@ -31,7 +31,10 @@ Microsoft Windows
Linux / Unix Linux / Unix
---------------------------------------------------------------------------------- ----------------------------------------------------------------------------------
There is no required extra dependency, you only need Qt tools. You need to have Qt 4 (>= 4.7) or Qt 5 development libraries, pkg-config is
highly recommended to correctly detect QtWebKit version.
Next compulsory requirement is OpenSSL (libcrypto). X11 libraries are also
required unless you specify NO_X11 build option.
To build spellcheck plugin, you need: To build spellcheck plugin, you need:
- QtWebKit 2.3 or higher - QtWebKit 2.3 or higher

View File

@ -41,12 +41,14 @@ and you have read the [BUILDING](https://github.com/QupZilla/qupzilla/blob/maste
**Linux** **Linux**
* pkg-config is optional (to correctly detect versions of QtWebKit) * OpenSSL (libcrypto) is required
* pkg-config is recommended (to correctly detect versions of QtWebKit)
* pkg-config is required for Hunspell spellcheck * pkg-config is required for Hunspell spellcheck
* Hunspell development package for spellcheck * Hunspell development package for spellcheck
* QtWebKit 2.3 is needed to have support for spellcheck * QtWebKit 2.3 is needed to have support for spellcheck
**Windows** **Windows**
* OpenSSL (libeay32) is required
* QtWebKit 2.3 is required * QtWebKit 2.3 is required
* Hunspell library is required for spellcheck * Hunspell library is required for spellcheck

View File

@ -504,6 +504,8 @@ isEqual(QT_MAJOR_VERSION, 5) {
win32 { win32 {
HEADERS += other/registerqappassociation.h HEADERS += other/registerqappassociation.h
SOURCES += other/registerqappassociation.cpp SOURCES += other/registerqappassociation.cpp
LIBS += -llibeay32
} }
mac { mac {
@ -516,7 +518,7 @@ mac {
LIBS += -framework CoreServices LIBS += -framework CoreServices
} }
LIBS += -llibeay32 LIBS += -lcrypto
message(===========================================) message(===========================================)
message( Using following defines:) message( Using following defines:)