From a0b9e663d3a204bbaee2f6150c8b0511d396a295 Mon Sep 17 00:00:00 2001
From: Andras Becsi <andras.becsi@digia.com>
Date: Thu, 26 Feb 2015 12:48:56 +0100
Subject: [PATCH] Create application bundles for widget examples on OS X
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Do not remove app_bundle from CONFIG and update the Info.plist file
for the Browser example to have the correct resolution on retina
displays.
This patch also updates the snapshot sha1 to include localization
patch and one that removes a additional duplicate lower-case header
file that was causing problems during source packaging.

[ChangeLog][QtWebEngineWidgets][OS X] Fix example on retina display

Change-Id: I682d41ca13d33ec06837ad862924382f4236d76c
Task-number: QTBUG-44633
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
---
 examples/webenginewidgets/browser/Info_mac.plist |  4 +++-
 examples/webenginewidgets/browser/browser.pro    | 16 ----------------
 .../fancybrowser/fancybrowser.pro                |  2 --
 src/3rdparty                                     |  2 +-
 4 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/examples/webenginewidgets/browser/Info_mac.plist b/examples/webenginewidgets/browser/Info_mac.plist
index 2731c105d..ccd4b3f28 100644
--- a/examples/webenginewidgets/browser/Info_mac.plist
+++ b/examples/webenginewidgets/browser/Info_mac.plist
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
-<plist version="0.9">
+<plist version="1.0">
 <dict>
+        <key>NSPrincipalClass</key>
+        <string>NSApplication</string>
         <key>CFBundleIconFile</key>
         <string>@ICON@</string>
         <key>CFBundlePackageType</key>
diff --git a/examples/webenginewidgets/browser/browser.pro b/examples/webenginewidgets/browser/browser.pro
index c9bf1a9e0..f54186856 100644
--- a/examples/webenginewidgets/browser/browser.pro
+++ b/examples/webenginewidgets/browser/browser.pro
@@ -2,8 +2,6 @@ TEMPLATE = app
 TARGET = browser
 QT += webenginewidgets network widgets printsupport
 
-macx: CONFIG -= app_bundle
-
 qtHaveModule(uitools):!embedded: QT += uitools
 else: DEFINES += QT_NO_UITOOLS
 
@@ -82,20 +80,6 @@ mac {
     ICON = browser.icns
     QMAKE_INFO_PLIST = Info_mac.plist
     TARGET = Browser
-
-    # No 64-bit Flash on Mac, so build the browser 32-bit
-    contains(QT_CONFIG, x86) {
-        CONFIG -= x86_64
-        CONFIG += x86
-    }
-    contains(QT_CONFIG, ppc) {
-        CONFIG -= ppc64
-        CONFIG += ppc
-    }
-}
-
-wince*: {
-    DEPLOYMENT_PLUGIN += qjpeg qgif
 }
 
 EXAMPLE_FILES = Info_mac.plist browser.icns browser.ico browser.rc
diff --git a/examples/webenginewidgets/fancybrowser/fancybrowser.pro b/examples/webenginewidgets/fancybrowser/fancybrowser.pro
index 5f2db6ee3..e5dcd9678 100644
--- a/examples/webenginewidgets/fancybrowser/fancybrowser.pro
+++ b/examples/webenginewidgets/fancybrowser/fancybrowser.pro
@@ -1,7 +1,5 @@
 QT      +=  webenginewidgets
 
-macx: CONFIG -= app_bundle
-
 HEADERS =   mainwindow.h
 SOURCES =   main.cpp \
             mainwindow.cpp
diff --git a/src/3rdparty b/src/3rdparty
index 8a9d85c33..8ccba3b14 160000
--- a/src/3rdparty
+++ b/src/3rdparty
@@ -1 +1 @@
-Subproject commit 8a9d85c33baac7fcd9918ed7261dc6db52855410
+Subproject commit 8ccba3b14520a84d8c13dd591aef471de8cb5fcf
-- 
GitLab