Merge remote-tracking branch 'origin/5.9' into dev

Change-Id: Ida702fd5fa05a32d6cd7fc737aa061da74b675a0

1 files changed, 2 insertions, 1 deletions

diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp
index 270096553..399c036a4 100644
--- a/src/core/web_contents_adapter.cpp
+++ b/src/core/web_contents_adapter.cpp
@@ -402,6 +402,7 @@ void WebContentsAdapter::initialize(WebContentsAdapterClient *adapterClient)
     // We keep a reference to browserContextAdapter to keep it alive as long as we use it.
     // This is needed in case the QML WebEngineProfile is garbage collected before the WebEnginePage.
     d->browserContextAdapter = adapterClient->browserContextAdapter();
+    Q_ASSERT(d->browserContextAdapter);
 
     // Create our own if a WebContents wasn't provided at construction.
     if (!d->webContents)
@@ -1228,7 +1229,7 @@ static void fillDropDataFromMimeData(content::DropData *dropData, const QMimeDat
         return;
     if (mimeData->hasHtml())
         dropData->html = toNullableString16(mimeData->html());
-    else if (mimeData->hasText())
+    if (mimeData->hasText())
         dropData->text = toNullableString16(mimeData->text());
 }