diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-17 09:26:54 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-17 09:28:29 +0100 |
| commit | 5cd506a8e1bcad3d0b414827db51b907e9f4a94b (patch) | |
| tree | cf4d9337b2acb80c75fd578c95884960717d4df2 | |
| parent | d2ff5a085572b1ee24dcb42ae107063f3142d14e (diff) | |
| parent | be8e169ba38c84562194906047d0da04bf3ae91a (diff) | |
| download | qtwebkit-5cd506a8e1bcad3d0b414827db51b907e9f4a94b.tar.gz | |
Merge remote-tracking branch 'origin/5.6.0' into 5.6
Change-Id: I7401888416c81bca2a26c14af9393c08b428b445
| -rw-r--r-- | Source/WebKit/qt/WidgetApi/qwebframe.cpp | 7 | ||||
| -rw-r--r-- | Tools/qmake/mkspecs/features/configure.prf | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/Source/WebKit/qt/WidgetApi/qwebframe.cpp b/Source/WebKit/qt/WidgetApi/qwebframe.cpp index 38c649887..dd08725eb 100644 --- a/Source/WebKit/qt/WidgetApi/qwebframe.cpp +++ b/Source/WebKit/qt/WidgetApi/qwebframe.cpp @@ -910,10 +910,9 @@ void QWebFrame::print(QPrinter *printer) const Evaluates the JavaScript defined by \a scriptSource using this frame as context and returns the result of the last executed statement. - \note This method may be very inefficient if \a scriptSource returns - - For example, evaluation of the next innocuously looking code may take a lot - of CPU and memory to execute: + \note This method may be very inefficient if \a scriptSource returns a DOM element + as a result. For example, evaluation of the next innocuously looking code may take + a lot of CPU and memory to execute: \code var img = document.createElement('img'); diff --git a/Tools/qmake/mkspecs/features/configure.prf b/Tools/qmake/mkspecs/features/configure.prf index 0df5ee49e..757ddfe4e 100644 --- a/Tools/qmake/mkspecs/features/configure.prf +++ b/Tools/qmake/mkspecs/features/configure.prf @@ -124,7 +124,10 @@ defineTest(finalizeConfigure) { addReasonForSkippingBuild("ICU is required.") } production_build:blackberry { - addReasonForSkippingBuild("Build not supported on BB10 yet.") + addReasonForSkippingBuild("Build not supported on BB10.") + } + production_build:android { + addReasonForSkippingBuild("Build not supported on Android.") } !gnu_thin_archives:!win32-msvc2013:!mingw:contains(QT_CONFIG, static) { addReasonForSkippingBuild("QtWebKit cannot be built as a static library on this platform. Check your configuration in qtbase/config.summary.") |