CefView · tishion · Oct 25, 2022 · Oct 16, 2022 · Oct 16, 2022 · Oct 16, 2022
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -107,10 +107,6 @@ else()
   )
 endif()
 
-if(OS_MACOS)
-  set(CMAKE_OSX_DEPLOYMENT_TARGET 10.11)
-endif()
-
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/output/$<CONFIG>/bin)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/output/$<CONFIG>/bin)
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/output/$<CONFIG>/lib)
@@ -125,6 +121,34 @@ endforeach(CefViewWingTarget)
 
 set_target_properties(libcef_dll_wrapper PROPERTIES FOLDER core)
 
+# read CEF version from cef_version.h
+file(READ "${CefViewCore_CEF_INCLUDE_DIR}/cef_version.h" cef_version_content)
+string(REGEX MATCH "#define CEF_VERSION_MAJOR ([0-9]+)" _ ${cef_version_content})
+set(CEF_VERSION_MAJOR ${CMAKE_MATCH_1})
+message(STATUS "CEF_VERSION_MAJOR: ${CEF_VERSION_MAJOR}")
+
+string(REGEX MATCH "#define CEF_VERSION_MINOR ([0-9]+)" _ ${cef_version_content})
+set(CEF_VERSION_MINOR ${CMAKE_MATCH_1})
+message(STATUS "CEF_VERSION_MINOR: ${CEF_VERSION_MINOR}")
+
+string(REGEX MATCH "#define CEF_VERSION_PATCH ([0-9]+)" _ ${cef_version_content})
+set(CEF_VERSION_PATCH ${CMAKE_MATCH_1})
+message(STATUS "CEF_VERSION_PATCH: ${CEF_VERSION_PATCH}")
+
+configure_file(
+  "${CMAKE_SOURCE_DIR}/src/QCefView_global.h.in"
+  "${CMAKE_SOURCE_DIR}/include/QCefView_global.h"
+  @ONLY
+)
+
+if(OS_MACOS)
+  if(CEF_VERSION_MAJOR LESS 104)
+    set(CMAKE_OSX_DEPLOYMENT_TARGET 10.11)
+  else()
+    set(CMAKE_OSX_DEPLOYMENT_TARGET 10.13)
+  endif()
+endif()
+
 # Config QCefView target
 # ##############################################################
 add_subdirectory(src)

diff --git a/CefViewCore b/CefViewCore
diff --git a/example/QCefViewTest/MainWindow.cpp b/example/QCefViewTest/MainWindow.cpp
@@ -55,7 +55,11 @@ MainWindow::createCefView()
   ///*
   // build settings for per QCefView
   QCefSetting setting;
+
+#if CEF_VERSION_MAJOR < 100
   setting.setPlugins(false);
+#endif
+
   setting.setWindowlessFrameRate(60);
   setting.setBackgroundColor(QColor::fromRgba(qRgba(255, 255, 220, 255)));
   // setting.setBackgroundColor(Qt::blue);

diff --git a/example/QCefViewTest/main.cpp b/example/QCefViewTest/main.cpp
@@ -18,7 +18,7 @@ main(int argc, char* argv[])
   config.setBackgroundColor(Qt::lightGray);
 
   // WindowlessRenderingEnabled is set to true by default, set to false to disable the OSR mode
-  config.setWindowlessRenderingEnabled(false);
+  // config.setWindowlessRenderingEnabled(false);
   // config.addCommandLineSwitch("disable-gpu");
 
   // add command line args

diff --git a/include/QCefSetting.h b/include/QCefSetting.h
@@ -268,6 +268,7 @@ class QCEFVIEW_EXPORT QCefSetting
   /// <returns>True to enalbe; false to disable</returns>
   const QVariant javascriptDomPaste() const;
 
+#if CEF_VERSION_MAJOR < 100
   /// <summary>
   /// Sets to enable or disable plugins
   /// </summary>
@@ -279,6 +280,7 @@ class QCEFVIEW_EXPORT QCefSetting
   /// </summary>
   /// <returns>True to enalbe; false to disable</returns>
   const QVariant plugins() const;
+#endif
 
   /// <summary>
   /// Sets to enable or disable the permission of loading images

diff --git a/include/QCefView_global.h b/include/QCefView_global.h
@@ -10,23 +10,31 @@
 #define QCEFEVIEW_GLOBAL_H
 #pragma once
 
+// clang-format off
 #pragma region qt_headers
 #include <QtCore/qglobal.h>
-
 #include <QMetaType>
 #pragma endregion qt_headers
 
 #ifdef QCEFVIEW_STATIC
-#define QCEFVIEW_EXPORT
-#else
-#ifdef QCEFVIEW_LIB
-#define QCEFVIEW_EXPORT Q_DECL_EXPORT
+    // Static library, no need export
+    #define QCEFVIEW_EXPORT
 #else
-#define QCEFVIEW_EXPORT Q_DECL_IMPORT
-#if _WIN32
-#pragma comment(lib, "QCefView.lib")
-#endif
-#endif
+    // Dynamic library
+    #ifdef QCEFVIEW_LIB
+        // Build QCefView project, export API
+        #define QCEFVIEW_EXPORT Q_DECL_EXPORT
+    #else
+        // Referenced by other project, import API 
+        #define QCEFVIEW_EXPORT Q_DECL_IMPORT
+        #if _WIN32
+            #pragma comment(lib, "QCefView.lib")
+        #endif
+    #endif
 #endif
 
+// CEF major version number
+#define CEF_VERSION_MAJOR 106
+// clang-format on
+
 #endif // QCEFEVIEW_GLOBAL_H
diff --git a/src/QCefSetting.cpp b/src/QCefSetting.cpp
@@ -1,13 +1,18 @@
 #include "QCefSetting.h"
 
+#pragma region cef_headers
+#include <include/cef_version.h>
+#pragma endregion cef_headers
+
 #include "details/QCefSettingPrivate.h"
 #include "details/utils/CommonUtils.h"
 
 REGISTER_METATYPE(QCefSetting);
 
 QCefSetting::QCefSetting()
   : d_ptr(new QCefSettingPrivate)
-{}
+{
+}
 
 QCefSetting::QCefSetting(const QCefSetting& other)
   : d_ptr(new QCefSettingPrivate)
@@ -276,6 +281,7 @@ QCefSetting::javascriptDomPaste() const
   return d->javascriptDomPaste_;
 }
 
+#if CEF_VERSION_MAJOR < 100
 void
 QCefSetting::setPlugins(const bool value)
 {
@@ -289,6 +295,7 @@ QCefSetting::plugins() const
   Q_D(const QCefSetting);
   return d->plugins_;
 }
+#endif
 
 void
 QCefSetting::setImageLoading(const bool value)

diff --git a/src/QCefView_global.h.in b/src/QCefView_global.h.in
@@ -0,0 +1,40 @@
+/*
+ * File: QCefView_global.h
+ * Project: QCefView
+ * Created: 29th March 2016
+ * Author: Sheen
+ * Source: https://github.com/cefview/qcefview
+ * Docs: https://cefview.github.io/QCefView/
+ */
+#ifndef QCEFEVIEW_GLOBAL_H
+#define QCEFEVIEW_GLOBAL_H
+#pragma once
+
+// clang-format off
+#pragma region qt_headers
+#include <QtCore/qglobal.h>
+#include <QMetaType>
+#pragma endregion qt_headers
+
+#ifdef QCEFVIEW_STATIC
+    // Static library, no need export
+    #define QCEFVIEW_EXPORT
+#else
+    // Dynamic library
+    #ifdef QCEFVIEW_LIB
+        // Build QCefView project, export API
+        #define QCEFVIEW_EXPORT Q_DECL_EXPORT
+    #else
+        // Referenced by other project, import API 
+        #define QCEFVIEW_EXPORT Q_DECL_IMPORT
+        #if _WIN32
+            #pragma comment(lib, "QCefView.lib")
+        #endif
+    #endif
+#endif
+
+// CEF major version number
+#cmakedefine CEF_VERSION_MAJOR @CEF_VERSION_MAJOR@
+// clang-format on
+
+#endif // QCEFEVIEW_GLOBAL_H
diff --git a/src/details/QCefDownloadItemPrivate.cpp b/src/details/QCefDownloadItemPrivate.cpp
@@ -1,5 +1,9 @@
 #include "QCefDownloadItemPrivate.h"
 
+#pragma region cef_headers
+#include <include/cef_version.h>
+#pragma endregion cef_headers
+
 #include <QCefDownloadItem.h>
 
 QSharedPointer<QCefDownloadItem>
@@ -24,11 +28,19 @@ QCefDownloadItemPrivate::createQCefDownloadItem(CCefClientDelegate::RefPtr handl
   double t = 0;
   cef_time_t ct;
 
+#if CEF_VERSION_MAJOR >= 104
+  cef_time_from_basetime(cefItem.GetStartTime(), &ct);
+#else
   ct = cefItem.GetStartTime();
+#endif
   if (cef_time_to_doublet(&ct, &t))
     p->d_ptr->startTime = QDateTime::fromSecsSinceEpoch(t);
 
+#if CEF_VERSION_MAJOR >= 104
+  cef_time_from_basetime(cefItem.GetEndTime(), &ct);
+#else
   ct = cefItem.GetEndTime();
+#endif
   if (cef_time_to_doublet(&ct, &t))
     p->d_ptr->endTime = QDateTime::fromSecsSinceEpoch(t);
 
@@ -62,11 +74,19 @@ QCefDownloadItemPrivate::updateDownloadItem(QCefDownloadItem* p,
   double t = 0;
   cef_time_t ct;
 
+#if CEF_VERSION_MAJOR >= 104
+  cef_time_from_basetime(cefItem.GetStartTime(), &ct);
+#else
   ct = cefItem.GetStartTime();
+#endif
   if (cef_time_to_doublet(&ct, &t))
     p->d_ptr->startTime = QDateTime::fromSecsSinceEpoch(t);
 
+#if CEF_VERSION_MAJOR >= 104
+  cef_time_from_basetime(cefItem.GetEndTime(), &ct);
+#else
   ct = cefItem.GetEndTime();
+#endif
   if (cef_time_to_doublet(&ct, &t))
     p->d_ptr->endTime = QDateTime::fromSecsSinceEpoch(t);
 

diff --git a/src/details/QCefSettingPrivate.cpp b/src/details/QCefSettingPrivate.cpp
@@ -7,6 +7,10 @@
 #include <QString>
 #pragma endregion qt_headers
 
+#pragma region cef_headers
+#include <include/cef_version.h>
+#pragma endregion cef_headers
+
 #include <QCefContext.h>
 
 #include <CefViewCoreProtocol.h>
@@ -64,8 +68,10 @@ QCefSettingPrivate::CopyFromCefBrowserSettings(QCefSetting* qs, const CefBrowser
   if (cs->javascript_dom_paste != STATE_DEFAULT)
     qs->d_ptr->javascriptDomPaste_ = cs->javascript_dom_paste == STATE_ENABLED;
 
+#if CEF_VERSION_MAJOR < 100
   if (cs->plugins != STATE_DEFAULT)
     qs->d_ptr->plugins_ = cs->plugins == STATE_ENABLED;
+#endif
 
   if (cs->image_loading != STATE_DEFAULT)
     qs->d_ptr->imageLoading_ = cs->image_loading == STATE_ENABLED;
@@ -157,8 +163,10 @@ QCefSettingPrivate::CopyToCefBrowserSettings(const QCefSetting* qs, CefBrowserSe
   if (qs->d_ptr->javascriptDomPaste_.canConvert<bool>())
     cs->javascript_dom_paste = qs->d_ptr->javascriptDomPaste_.toBool() ? STATE_ENABLED : STATE_DISABLED;
 
+#if CEF_VERSION_MAJOR < 100
   if (qs->d_ptr->plugins_.canConvert<bool>())
     cs->plugins = qs->d_ptr->plugins_.toBool() ? STATE_ENABLED : STATE_DISABLED;
+#endif
 
   if (qs->d_ptr->imageLoading_.canConvert<bool>())
     cs->image_loading = qs->d_ptr->imageLoading_.toBool() ? STATE_ENABLED : STATE_DISABLED;

diff --git a/src/details/QCefSettingPrivate.h b/src/details/QCefSettingPrivate.h
@@ -50,7 +50,9 @@ class QCefSettingPrivate
   /* bool */ QVariant javascriptCloseWindows_;
   /* bool */ QVariant javascriptAccessClipboard_;
   /* bool */ QVariant javascriptDomPaste_;
+#if CEF_VERSION_MAJOR < 100
   /* bool */ QVariant plugins_;
+#endif
   /* bool */ QVariant imageLoading_;
   /* bool */ QVariant imageShrinkStandaloneToFit_;
   /* bool */ QVariant textAreaResize_;