diff options
| author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2016-03-08 12:15:03 +0100 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2016-03-08 12:15:50 +0100 |
| commit | 75423185e4b03fabfeeee403f3bd9a6063078ee6 (patch) | |
| tree | 6ad81ff44dda72126463fd3473be1567638b2436 /src/qml/qml/v8/qv8engine_p.h | |
| parent | a2d4f1610db204e42722f20ff64716a14dc109c0 (diff) | |
| parent | 3879b3f883dd66feddc190eb8bad330367a31ace (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/scenegraphng
Change-Id: I05f4e29dd3435bb843f9b2250574a61d688d5992
Diffstat (limited to 'src/qml/qml/v8/qv8engine_p.h')
| -rw-r--r-- | src/qml/qml/v8/qv8engine_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qml/qml/v8/qv8engine_p.h b/src/qml/qml/v8/qv8engine_p.h index 4ffd36ca34..9054c731db 100644 --- a/src/qml/qml/v8/qv8engine_p.h +++ b/src/qml/qml/v8/qv8engine_p.h @@ -194,10 +194,12 @@ public: void freezeObject(const QV4::Value &value); +#ifndef QT_NO_NETWORK // Return the network access manager for this engine. By default this returns the network // access manager of the QQmlEngine. It is overridden in the case of a threaded v8 // instance (like in WorkerScript). virtual QNetworkAccessManager *networkAccessManager(); +#endif // Return the list of illegal id names (the names of the properties on the global object) const QSet<QString> &illegalNames() const; |