diff --git a/CefViewCore b/CefViewCore index ace40ad0..8581a1fa 160000 --- a/CefViewCore +++ b/CefViewCore @@ -1 +1 @@ -Subproject commit ace40ad0cddcaccedcb41abd4ecfbd8ce40a0c4e +Subproject commit 8581a1facf6978e692c0f7a95c81e3f50fea74ee diff --git a/include/QCefView.h b/include/QCefView.h index b10c676b..f92f8369 100644 --- a/include/QCefView.h +++ b/include/QCefView.h @@ -398,15 +398,15 @@ class QCEFVIEW_EXPORT QCefView : public QWidget protected: /// - /// + /// Gets called before a new browser created (only for browser created by non-JavaScript) /// - /// - /// - /// - /// - /// - /// - /// + /// The source frame id + /// The target URL + /// The target name + /// Target window open method + /// Rect to be used for the popup + /// Settings to be used for the popup + /// True to cancel the popup; false to allow /// virtual QCefView* onNewBrowser(qint64 sourceFrameId, const QString& url, @@ -416,7 +416,7 @@ class QCEFVIEW_EXPORT QCefView : public QWidget QCefSetting& settings); /// - /// Gets called before the popup browser created + /// Gets called before the popup browser created (only for browser created by JavaScript) /// /// The source frame id /// The target URL diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index bd48d73a..304ae953 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -69,7 +69,7 @@ if(OS_WINDOWS) # copy binary files of CefViewCore COMMAND ${CMAKE_COMMAND} -E copy_directory - "$" + "$" "$" # gnerate a file contains timestamp diff --git a/src/details/QCefConfigPrivate.cpp b/src/details/QCefConfigPrivate.cpp index 83b94656..9b66df10 100644 --- a/src/details/QCefConfigPrivate.cpp +++ b/src/details/QCefConfigPrivate.cpp @@ -7,6 +7,7 @@ #pragma endregion qt_headers #include +#include QCefConfigPrivate::QCefConfigPrivate() { diff --git a/src/mac/details/QCefContextPrivate_mac.mm b/src/mac/details/QCefContextPrivate_mac.mm index f5eef17a..0b277ef0 100644 --- a/src/mac/details/QCefContextPrivate_mac.mm +++ b/src/mac/details/QCefContextPrivate_mac.mm @@ -9,12 +9,15 @@ #include #pragma endregion cef_headers +#include +#include + #include "../../details/QCefConfigPrivate.h" #define CEF_BINARY_NAME "Chromium Embedded Framework" #define CEF_FRAMEWORK_NAME "Chromium Embedded Framework.framework" -#define HELPER_BUNDLE_NAME "CefViewWing.app" -#define HELPER_BINARY_NAME "CefViewWing" +#define HELPER_BINARY_NAME kCefViewRenderProcessName +#define HELPER_BUNDLE_NAME HELPER_BINARY_NAME ".app" #define PLUGINS_NAME "PlugIns" @interface PathFactory : NSObject