diff --git a/examples/webenginewidgets/browser/Info_mac.plist b/examples/webenginewidgets/browser/Info_mac.plist index 2731c105da42edfed785d83974d8ba20ecc8eff8..ccd4b3f2822f6e720d58ab240db821919d3530f2 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 c9bf1a9e0fb1e9902920943b3378c1d7ac63a374..f541868568728bb09a93b5fd2f16117cd5114394 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 5f2db6ee3cb76cf228c1257bfb26161a3acc7c50..e5dcd9678fbcb1aecfdf2a2dc74656b7cd8d6b7c 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 8a9d85c33baac7fcd9918ed7261dc6db52855410..8ccba3b14520a84d8c13dd591aef471de8cb5fcf 160000 --- a/src/3rdparty +++ b/src/3rdparty @@ -1 +1 @@ -Subproject commit 8a9d85c33baac7fcd9918ed7261dc6db52855410 +Subproject commit 8ccba3b14520a84d8c13dd591aef471de8cb5fcf