Adapt CEF versionn 115+

CefView · Sep 3, 2023 · 167231f · 167231f
1 parent 8a6db98
commit 167231f
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 2 deletions.
diff --git a/include/QCefConfig.h b/include/QCefConfig.h
@@ -188,6 +188,7 @@ class QCEFVIEW_EXPORT QCefConfig
   /// </summary>
   const QString cachePath() const;
 
+#if CEF_VERSION_MAJOR < 115
   /// <summary>
   /// Sets the user data directory path
   /// </summary>
@@ -199,6 +200,20 @@ class QCEFVIEW_EXPORT QCefConfig
   /// </summary>
   const QString userDataPath() const;
 
+#else
+
+  /// <summary>
+  /// Gets the root cache directory path
+  /// </summary>
+  const QString rootCachePath() const;
+
+  /// <summary>
+  /// Sets the root cache directory path
+  /// </summary>
+  /// <param name="path">The root cache directory path</param>
+  void setRootCachePath(const QString& path);
+#endif
+
   /// <summary>
   /// Sets the bridge object name
   /// </summary>

diff --git a/include/QCefView_global.h b/include/QCefView_global.h
@@ -34,9 +34,9 @@
 #endif
 
 // CEF version numbers
-#define CEF_VERSION_MAJOR 113
+#define CEF_VERSION_MAJOR 115
 #define CEF_VERSION_MINOR 3
-#define CEF_VERSION_PATCH 1
+#define CEF_VERSION_PATCH 15
 
 // clang-format on
 

diff --git a/src/QCefConfig.cpp b/src/QCefConfig.cpp
@@ -159,6 +159,7 @@ QCefConfig::cachePath() const
   return QString::fromStdString(d->cachePath_);
 }
 
+#if CEF_VERSION_MAJOR < 115
 void
 QCefConfig::setUserDataPath(const QString& path)
 {
@@ -173,6 +174,23 @@ QCefConfig::userDataPath() const
   return QString::fromStdString(d->userDataPath_);
 }
 
+#else
+
+const QString
+QCefConfig::rootCachePath() const
+{
+  Q_D(const QCefConfig);
+  return QString::fromStdString(d->rootCachePath_);
+}
+
+void
+QCefConfig::setRootCachePath(const QString& path)
+{
+  Q_D(QCefConfig);
+  d->rootCachePath_ = path.toStdString();
+}
+#endif
+
 void
 QCefConfig::setBridgeObjectName(const QString& name)
 {

diff --git a/src/details/QCefConfigPrivate.cpp b/src/details/QCefConfigPrivate.cpp
@@ -72,8 +72,13 @@ QCefConfigPrivate::CopyToCefSettings(const QCefConfig* config, CefSettings* sett
   if (!config->d_ptr->cachePath_.empty())
     CefString(&settings->cache_path) = config->d_ptr->cachePath_;
 
+#if CEF_VERSION_MAJOR < 115
   if (!config->d_ptr->userDataPath_.empty())
     CefString(&settings->user_data_path) = config->d_ptr->userDataPath_;
+#else
+  if (!config->d_ptr->rootCachePath_.empty())
+    CefString(&settings->root_cache_path) = config->d_ptr->rootCachePath_;
+#endif
 
   if (!config->d_ptr->locale_.empty())
     CefString(&settings->locale) = config->d_ptr->locale_;

diff --git a/src/details/QCefConfigPrivate.h b/src/details/QCefConfigPrivate.h
@@ -31,7 +31,13 @@ class QCefConfigPrivate
   std::string locale_;
   std::string userAgent_;
   std::string cachePath_;
+
+#if CEF_VERSION_MAJOR < 115
   std::string userDataPath_;
+#else
+  std::string rootCachePath_;
+#endif
+
   std::string bridgeObjectName_;
   std::string acceptLanguageList_;