Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7

4 files changed, 18 insertions, 15 deletions

diff --git a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc
index c5f373029..dec9d0407 100644
--- a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc
+++ b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc
@@ -134,7 +134,7 @@
     codecs can be enabled by passing the following option to qmake:
 
     \code
-    qmake WEBENGINE_CONFIG += use_proprietary_codecs
+    qmake WEBENGINE_CONFIG+=use_proprietary_codecs
     \endcode
 
     \warning When distributing proprietary codec libraries, you must acquire licenses for them.
diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
index 54989caaf..447c53ba9 100644
--- a/src/webenginewidgets/api/qwebenginepage.cpp
+++ b/src/webenginewidgets/api/qwebenginepage.cpp
@@ -815,6 +815,10 @@ QAction *QWebEnginePage::action(WebAction action) const
         text = tr("Reload");
         icon = style->standardIcon(QStyle::SP_BrowserReload);
         break;
+    case ReloadAndBypassCache:
+        text = tr("Reload and Bypass Cache");
+        icon = style->standardIcon(QStyle::SP_BrowserReload);
+        break;
     case Cut:
         text = tr("Cut");
         break;
@@ -896,7 +900,9 @@ QAction *QWebEnginePage::action(WebAction action) const
     case SavePage:
         text = tr("Save &Page");
         break;
-    default:
+    case NoWebAction:
+    case WebActionCount:
+        Q_UNREACHABLE();
         break;
     }
 
@@ -1084,8 +1090,11 @@ void QWebEnginePage::triggerAction(WebAction action, bool)
     case SavePage:
         d->adapter->save();
         break;
-    default:
+    case NoWebAction:
+        break;
+    case WebActionCount:
         Q_UNREACHABLE();
+        break;
     }
 }
 
@@ -1157,11 +1166,10 @@ bool QWebEnginePagePrivate::contextMenuRequested(const WebEngineContextMenuData
             QMenu::exec(view->actions(), event.globalPos(), 0, view);
             break;
         }
-        // fall through
-    default:
+        // fallthrough
+    case Qt::NoContextMenu:
         event.ignore();
         return false;
-        break;
     }
     view->d_func()->m_pendingContextMenuEvent = false;
     return true;
@@ -1210,8 +1218,6 @@ void QWebEnginePagePrivate::javascriptDialog(QSharedPointer<JavaScriptDialogCont
     case InternalAuthorizationDialog:
         accepted = (QMessageBox::question(view, controller->title(), controller->message(), QMessageBox::Yes, QMessageBox::No) == QMessageBox::Yes);
         break;
-    default:
-        Q_UNREACHABLE();
     }
     if (accepted)
         controller->accept();
@@ -1397,7 +1403,7 @@ void QWebEnginePage::setFeaturePermission(const QUrl &securityOrigin, QWebEngine
         else
             d->adapter->grantMouseLockPermission(false);
         break;
-    default:
+    case Notifications:
         break;
     }
 }
@@ -1603,7 +1609,6 @@ QStringList QWebEnginePage::chooseFiles(FileSelectionMode mode, const QStringLis
         if (!str.isNull())
             ret << str;
         break;
-    default:
     case FilePickerController::Open:
         str = QFileDialog::getOpenFileName(view(), QString(), oldFiles.first());
         if (!str.isNull())
diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
index eb0c5910e..34ef42f89 100644
--- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
+++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
@@ -3983,9 +3983,7 @@ void tst_QWebEnginePage::setHtmlWithImageResource()
     page.setHtml(html);
     waitForSignal(&page, SIGNAL(loadFinished(bool)));
     QCOMPARE(evaluateJavaScriptSync(&page, "document.images.length").toInt(), 1);
-    QEXPECT_FAIL("", "https://bugs.webkit.org/show_bug.cgi?id=118659", Continue);
     QCOMPARE(evaluateJavaScriptSync(&page, "document.images[0].width").toInt(), 0);
-    QEXPECT_FAIL("", "https://bugs.webkit.org/show_bug.cgi?id=118659", Continue);
     QCOMPARE(evaluateJavaScriptSync(&page, "document.images[0].height").toInt(), 0);
 }
 
diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf
index 84ec4d7f0..0dfb67a84 100644
--- a/tools/qmake/mkspecs/features/configure.prf
+++ b/tools/qmake/mkspecs/features/configure.prf
@@ -90,7 +90,7 @@ defineTest(finalizeConfigure) {
                 skipBuild("Unmet dependencies: icu-uc, icu-i18n")
             }
         } else {
-            log("ICU............................... Using internal copy (Default, force system ICU with WEBENGINE_CONFIG += use_system_icu)$${EOL}")
+            log("ICU............................... Using internal copy (Default, force system ICU with WEBENGINE_CONFIG+=use_system_icu)$${EOL}")
         }
         use?(system_ffmpeg) {
             packagesExist("libavcodec libavformat libavutil") {
@@ -105,13 +105,13 @@ defineTest(finalizeConfigure) {
                 skipBuild("Unmet dependencies: libavcodec, libavformat, libavutil")
             }
         } else {
-            log("FFMPEG............................ Using internal copy (Default, force system FFMPEG with WEBENGINE_CONFIG += use_system_ffmpeg)$${EOL}")
+            log("FFMPEG............................ Using internal copy (Default, force system FFMPEG with WEBENGINE_CONFIG+=use_system_ffmpeg)$${EOL}")
         }
     }
     use?(proprietary_codecs) {
         log("Proprietary codecs (H264, MP3).... Enabled$${EOL}")
     } else {
-        log("Proprietary codecs (H264, MP3).... Not enabled         (Default, enable with WEBENGINE_CONFIG += use_proprietary_codecs)$${EOL}")
+        log("Proprietary codecs (H264, MP3).... Not enabled         (Default, enable with WEBENGINE_CONFIG+=use_proprietary_codecs)$${EOL}")
     }
     osx {
         use?(appstore_compliant_code) {