Skip to content

Commit cd607c1

Browse files
committed
documentation update
1 parent ad33f92 commit cd607c1

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

REQUIREMENTS.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ The only Linux and Macintosh compile-time requirement of PEB is a GCC-based Qt d
77
The source code of PEB is not MSVC-compatible and PEB can not be compiled using any MSVC-based Windows version of Qt. This means that:
88
* PEB Windows binaries can be compiled only by a GCC-based Qt development bundle.
99
* Only ```QtWebKit``` can be used by a Windows binary of PEB.
10-
Windows GCC-based Qt development bundles version 5.6 or later have neither ```QtWebEngine```, nor ```QtWebKit```.
10+
Windows GCC-based Qt development bundles version 5.6.x or higher have neither ```QtWebEngine```, nor ```QtWebKit```.
1111
* Updated ``QtWebKit`` headers and libraries have to be manually added from the
1212
[QtWebKit repository of Konstantin Tokarev (annulen)](https://github.com/annulen/webkit/releases) to all Windows GCC-based Qt development bundles version 5.6 or later.
1313

@@ -29,7 +29,7 @@ make
2929
## Compile-Time Settings
3030
All compile-time settings require editing the ``src/peb.pro`` project file according to the following instructions.
3131

32-
* QtWebKit Use
32+
* Updated QtWebKit
3333
To use ```QtWebKit``` or ```QtWebEngine``` depending on the Qt version, which is the default setting:
3434

3535
```QMake

src/peb.pro

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,25 +24,26 @@ greaterThan (QT_MAJOR_VERSION, 4) {
2424
message ("Qt Libraries: $$[QT_INSTALL_LIBS]")
2525

2626
##########################################################
27-
# QTWEBKIT USE
27+
# ANNULEN QTWEBKIT
2828
# Updated QtWebKit headers and libraries for
29-
# Qt versions 5.6 or higher can be downloaded from:
29+
# Qt versions 5.6.x or higher can be downloaded from:
3030
# https://github.com/annulen/webkit/releases
3131

32-
# To use QtWebKit or QtWebEngine depending on the Qt version:
32+
# To use QtWebKit or QtWebEngine depending on the Qt version,
33+
# which is the default setting:
3334
# ANNULEN_QTWEBKIT = 0
3435
# QtWebKit is the default web engine for Qt versions up to 5.5.x and
3536
# QtWebEngine is the default web engine for Qt versions 5.6.x or higher
3637

37-
# To use the updated QtWebKit version of Konstantin Tokarev (annulen) with
38-
# a Qt version higher than 5.5:
38+
# To use an updated QtWebKit version from
39+
# the repository of Konstantin Tokarev (annulen) with
40+
# a Qt version 5.6.x or higher:
3941
# ANNULEN_QTWEBKIT = 1
4042

41-
# ANNULEN_QTWEBKIT = 1
42-
# has no effect on Qt versions 5.5 or lower.
43+
# This setting has no effect on Qt versions 5.5 or lower.
4344
##########################################################
4445

45-
ANNULEN_QTWEBKIT = 1
46+
ANNULEN_QTWEBKIT = 0
4647

4748
DEFINES += "ANNULEN_QTWEBKIT=$$ANNULEN_QTWEBKIT"
4849

0 commit comments

Comments
 (0)