From 0927bf0cb7c40f502d539eebf3040461164b5072 Mon Sep 17 00:00:00 2001 From: nowrep Date: Fri, 21 Jun 2013 11:09:19 +0200 Subject: [PATCH] Fix compilation on Linux + update build requirements --- BUILDING | 5 ++++- README.md | 4 +++- src/lib/lib.pro | 4 +++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/BUILDING b/BUILDING index 71f1e2982..4d71cfa86 100644 --- a/BUILDING +++ b/BUILDING @@ -31,7 +31,10 @@ Microsoft Windows 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: - QtWebKit 2.3 or higher diff --git a/README.md b/README.md index 16a7db36b..f10769af7 100644 --- a/README.md +++ b/README.md @@ -41,12 +41,14 @@ and you have read the [BUILDING](https://github.com/QupZilla/qupzilla/blob/maste **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 * Hunspell development package for spellcheck * QtWebKit 2.3 is needed to have support for spellcheck **Windows** + * OpenSSL (libeay32) is required * QtWebKit 2.3 is required * Hunspell library is required for spellcheck diff --git a/src/lib/lib.pro b/src/lib/lib.pro index c4c3b2d5a..215f90147 100644 --- a/src/lib/lib.pro +++ b/src/lib/lib.pro @@ -504,6 +504,8 @@ isEqual(QT_MAJOR_VERSION, 5) { win32 { HEADERS += other/registerqappassociation.h SOURCES += other/registerqappassociation.cpp + + LIBS += -llibeay32 } mac { @@ -516,7 +518,7 @@ mac { LIBS += -framework CoreServices } -LIBS += -llibeay32 +LIBS += -lcrypto message(===========================================) message( Using following defines:)