diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2021-09-02 08:01:28 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-09-05 17:26:20 +0000 |
| commit | 8002d0dd522165054f03ecb61495fdb952272db2 (patch) | |
| tree | 5b3e7e6eb9f7c3f1429ba8e054e3cea96eae1b3d | |
| parent | 9e8e00301f3db39011a1a604dd4da83f23036509 (diff) | |
Fix manifest and plist for render process
Add manifest file in case of windows build.
Manifest verified with mt tool on windows:
mt -inputresource:QtWebEngineProcess.exe -out:process.manifest
For plist we use template MacOSXBundleInfo.plist.in and
only CFBundleIdentifier was missing compared to our
custom plist file.
Change-Id: Iafcc0d456ec43c6465eacd9a4719a388bf421f7c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit 9f4713cdbe872a69ca0d257444e20ca9212cc33d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/process/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/process/Info_mac.plist | 22 |
2 files changed, 7 insertions, 22 deletions
diff --git a/src/process/CMakeLists.txt b/src/process/CMakeLists.txt index c9ca8e139..e5b3759b8 100644 --- a/src/process/CMakeLists.txt +++ b/src/process/CMakeLists.txt @@ -15,6 +15,7 @@ qt_internal_add_executable(${qtWebEngineProcessName} if(WIN32) target_sources(${qtWebEngineProcessName} PRIVATE support_win.cpp) + target_sources(${qtWebEngineProcessName} PRIVATE QtWebEngineProcess.exe.manifest) target_link_libraries(${qtWebEngineProcessName} PRIVATE WebEngineCoreSandbox) set_property(TARGET ${qtWebEngineProcessName} PROPERTY WIN32_EXECUTABLE TRUE) # get libs rsp file, since cmake is not aware of PUBLIC libs for WebEngineCore @@ -22,6 +23,12 @@ if(WIN32) target_link_options(${qtWebEngineProcessName} PRIVATE "@${libs_rsp}") endif() +if(MACOS) + set_target_properties(${qtWebEngineProcessName} + PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.qt-project.Qt.QtWebEngineProcess" + ) +endif() + qt_internal_extend_target(${qtWebEngineProcessName} PUBLIC_LIBRARIES Qt::Gui diff --git a/src/process/Info_mac.plist b/src/process/Info_mac.plist deleted file mode 100644 index dcadc2e8f..000000000 --- a/src/process/Info_mac.plist +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> -<dict> - <key>NSPrincipalClass</key> - <string>NSApplication</string> - <key>CFBundleIconFile</key> - <string>@ICON@</string> - <key>CFBundlePackageType</key> - <string>APPL</string> - <key>CFBundleGetInfoString</key> - <string>Created by Qt/QMake</string> - <key>CFBundleSignature</key> - <string>@TYPEINFO@</string> - <key>CFBundleExecutable</key> - <string>@EXECUTABLE@</string> - <key>CFBundleIdentifier</key> - <string>org.qt-project.Qt.QtWebEngineProcess</string> - <key>LSUIElement</key> - <string>1</string> -</dict> -</plist> |