Skip to content

Commit c0ba05d

Browse files
committed
project file and documentation update
1 parent d9a3a48 commit c0ba05d

File tree

4 files changed

+12
-21
lines changed

4 files changed

+12
-21
lines changed

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,11 @@ Inspired by [NW.js](http://nwjs.io/) and [Electron](http://electron.atom.io/), P
9292
* [Optional logging of all browser actions](#log-files)
9393

9494
## Compile-time Requirements
95-
GCC compiler and Qt 5.1 - Qt 5.5 headers (including ``QtWebkit`` headers).
96-
The ``QtWebkit`` set of classes is deprecated in all later versions of Qt. They could still be usable if ``QtWebKit`` headers are manually added, but this approach is still not tested.
95+
GCC compiler and Qt 5.1 - 5.5 headers (including ``QtWebkit`` headers).
96+
The ``QtWebkit`` set of classes is deprecated and removed from all later versions of Qt.
97+
Compiling ``QtWebKit`` for a recent Qt version is possible, but this approach is resource-intensive and is not tested with the PEB sources.
9798

98-
The most important Qt dependency of PEB is not ``QtWebkit``, but ``QNetworkAccessManager`` which is subclassed to implement the local pseudo-domain of PEB and all requests to local content. Unfortunately ``QNetworkAccessManager`` is incompatible with the ecosystem of ``QtWebEngine`` - the new Blink-based web engine of Qt. This makes transition to ``QtWebEngine`` impractical because local POST requests and calls to local Perl scripts from JavaScript could not be supported. If you want to render the HTML GUI of your Perl desktop application using the Blink web engine, you may consider using [Electron](http://electron.atom.io/) or [NW.js](http://nwjs.io/) together with [camel-harness](https://github.com/ddmitov/camel-harness).
99+
The most important Qt dependency of PEB is not ``QtWebkit``, but ``QNetworkAccessManager`` which is subclassed to implement the local pseudo-domain of PEB and all requests to local content. Unfortunately ``QNetworkAccessManager`` is incompatible with the ecosystem of ``QtWebEngine`` - the new Blink-based web engine of Qt. The transition to ``QtWebEngine`` is impractical because local POST requests and calling local Perl scripts from JavaScript can not be supported. If you want to render the HTML GUI of your Perl desktop application using the Blink web engine, you may use [Electron](http://electron.atom.io/) or [NW.js](http://nwjs.io/) and [camel-harness](https://github.com/ddmitov/camel-harness).
99100

100101
Compiled and tested successfully using:
101102
* [Qt Creator 2.8.1 and Qt 5.1.1](http://download.qt.io/official_releases/qt/5.1/5.1.1/) on 32-bit Debian Linux,

REQUIREMENTS.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
## Compile-time Requirements
2-
GCC compiler and Qt 5.1 - Qt 5.5 headers.
3-
Later versions of Qt could be usable if ```QtWebKit``` headers and libraries are manually added, but this approach is still not tested.
4-
2+
GCC compiler and Qt 5.1 - 5.5 headers (including ``QtWebkit`` headers).
3+
The ``QtWebkit`` set of classes is deprecated and removed from all later versions of Qt.
4+
Compiling ``QtWebKit`` for a recent Qt version is possible, but this approach is resource-intensive and is not tested with the PEB sources.
5+
56
Compiled and tested successfully using:
67
* [Qt Creator 2.8.1 and Qt 5.1.1](http://download.qt.io/official_releases/qt/5.1/5.1.1/) on 32-bit Debian Linux,
78
* [Qt Creator 3.0.0 and Qt 5.2.0](http://download.qt.io/official_releases/qt/5.2/5.2.0/) on 32-bit Debian Linux,
@@ -11,11 +12,10 @@ Compiled and tested successfully using:
1112
* [Qt Creator 3.1.1 and Qt 5.4.1](http://download.qt.io/official_releases/qt/5.4/5.4.1/) on 64-bit Lubuntu 15.04 Linux,
1213
* [Qt Creator 3.5.1 and Qt 5.5.1](http://download.qt.io/official_releases/qt/5.5/5.5.1/) on 64-bit Lubuntu 15.04 Linux,
1314
* [Qt Creator 3.5.1 and Qt 5.5.1](http://download.qt.io/official_releases/qt/5.5/5.5.1/) on 64-bit Lubuntu 16.04 Linux.
14-
15+
1516
## Runtime Requirements
1617
* Qt 5 libraries - their full Linux list can be found inside the ```start-peb.sh``` script,
1718
* Perl 5 distribution - any Linux, Mac or Windows Perl distribution.
1819
[Strawberry Perl](http://strawberryperl.com/) PortableZIP editions are successfully used with all Windows builds of PEB.
1920
[Perlbrew](https://perlbrew.pl/) Perl distributions (5.18.4, 5.23.7) are successfully used with many Linux builds of PEB.
2021
PEB can also use any Perl on PATH.
21-

src/peb.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -781,10 +781,6 @@ QPage::QPage()
781781
setAttribute(QWebSettings::PluginsEnabled, false);
782782
QWebSettings::globalSettings()->
783783
setAttribute(QWebSettings::JavaEnabled, false);
784-
QWebSettings::globalSettings()->
785-
setAttribute(QWebSettings::JavascriptCanAccessClipboard, false);
786-
QWebSettings::globalSettings()->
787-
setAttribute(QWebSettings::LocalContentCanAccessFileUrls, false);
788784
QWebSettings::globalSettings()->
789785
setAttribute(QWebSettings::LocalContentCanAccessRemoteUrls, false);
790786

src/peb.pro

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,16 @@
1616
message ("Going to configure Perl Executing Browser for Qt $$[QT_VERSION]")
1717

1818
lessThan (QT_MAJOR_VERSION, 5) {
19-
error ("Perl Executing Browser requires at least Qt 5.1 headers.")
19+
error ("Perl Executing Browser requires Qt versions 5.1 to 5.5.")
2020
}
2121

2222
equals (QT_MAJOR_VERSION, 5) {
2323
lessThan (QT_MINOR_VERSION, 1) {
24-
error ("Perl Executing Browser requires at least Qt 5.1 headers.")
24+
error ("Perl Executing Browser requires Qt versions 5.1 to 5.5.")
2525
}
2626

2727
greaterThan (QT_MINOR_VERSION, 5) {
28-
packagesExist(webkitwidgets) {
29-
message ("Going to build with manually added QtWebKit libraries.")
30-
}
31-
32-
!packagesExist(webkitwidgets) {
33-
error ("QtWebKit libraries are not found.")
34-
}
28+
error ("Perl Executing Browser requires Qt versions 5.1 to 5.5.")
3529
}
3630

3731
message ("Qt Header files: $$[QT_INSTALL_HEADERS]")

0 commit comments

Comments
 (0)