Allow pass null value of QCefConfig and QCefSetting

example/QCefViewTest/CMakeLists.txt

@@ -21,13 +21,18 @@ elseif (OS_MACOS)
 else()
 endif()
 
+# Create an empty source file as the rebuild trigger
+# QCefView will update this file every time it gets built
+file(WRITE ${CMAKE_BINARY_DIR}/auto_rebuild.cpp "/* Auto Rebuild Trigger */")
+
 include_directories(
   ${CMAKE_SOURCE_DIR}/include
 )
 
 file(GLOB_RECURSE _SRC_FILES
   "*.h"
   "*.cpp"
+  ${CMAKE_BINARY_DIR}/auto_rebuild.cpp
 )
 
 file(GLOB_RECURSE _UI_FILES
@@ -77,29 +82,40 @@ if (OS_WINDOWS)
       VS_DEBUGGER_WORKING_DIRECTORY "$<TARGET_FILE_DIR:${PROJECT_NAME}>"
   )
 
-  add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
-    # Embed the manifest file into the target
-    COMMAND mt.exe 
-      -manifest \"${CMAKE_CURRENT_SOURCE_DIR}\\${PROJECT_NAME}.manifest\" 
-      -inputresource:\"$<TARGET_FILE:${PROJECT_NAME}>\" 
-      -outputresource:\"$<TARGET_FILE:${PROJECT_NAME}>\"
+  add_custom_command(TARGET ${PROJECT_NAME} 
+    PRE_BUILD
+
+      # Copy QCefView binary to output folder
+      COMMAND ${CMAKE_COMMAND} -E copy_directory 
+        $<TARGET_FILE_DIR:QCefView> 
+        $<TARGET_FILE_DIR:${PROJECT_NAME}>
+  )
+
+  add_custom_command(TARGET ${PROJECT_NAME} 
+    POST_BUILD
 
-    # Copy QCefView binary to output folder
-    COMMAND ${CMAKE_COMMAND} -E copy_directory 
-    $<TARGET_FILE_DIR:QCefView> 
-    $<TARGET_FILE_DIR:${PROJECT_NAME}>
+      # Embed the manifest file into the target
+      COMMAND mt.exe 
+        -manifest \"${CMAKE_CURRENT_SOURCE_DIR}\\${PROJECT_NAME}.manifest\" 
+        -inputresource:\"$<TARGET_FILE:${PROJECT_NAME}>\" 
+        -outputresource:\"$<TARGET_FILE:${PROJECT_NAME}>\"
+
+      # Copy QCefView binary to output folder
+      COMMAND ${CMAKE_COMMAND} -E copy_directory 
+        $<TARGET_FILE_DIR:QCefView> 
+        $<TARGET_FILE_DIR:${PROJECT_NAME}>
+
+      # Copy the webres directory to output folder
+      COMMAND ${CMAKE_COMMAND} -E copy_directory 
+        ${CMAKE_CURRENT_BINARY_DIR}/webres 
+        $<TARGET_FILE_DIR:${PROJECT_NAME}>/webres
 
-    # Copy the webres directory to output folder
-    COMMAND ${CMAKE_COMMAND} -E copy_directory 
-      ${CMAKE_CURRENT_BINARY_DIR}/webres 
-      $<TARGET_FILE_DIR:${PROJECT_NAME}>/webres
-
-    # Deploy the Qt Application
-    COMMAND ${DEPLOYQT_EXECUTABLE} 
-      --no-svg 
-      --no-translations 
-      --no-compiler-runtime 
-      $<TARGET_FILE:${PROJECT_NAME}>
+      # Deploy the Qt Application
+      COMMAND ${DEPLOYQT_EXECUTABLE} 
+        --no-svg 
+        --no-translations 
+        --no-compiler-runtime 
+        $<TARGET_FILE:${PROJECT_NAME}>
   )
 endif() # OS_WINDOWS
 
@@ -133,23 +149,34 @@ if (OS_LINUX)
       QCefView
   )
 
-  add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
-    # Copy QCefView binary to output folder
-    COMMAND ${CMAKE_COMMAND} -E copy_directory 
-    $<TARGET_FILE_DIR:QCefView> 
-    $<TARGET_FILE_DIR:${PROJECT_NAME}>
+  add_custom_command(TARGET ${PROJECT_NAME} 
+    PRE_BUILD
+
+      # Copy QCefView binary to output folder
+      COMMAND ${CMAKE_COMMAND} -E copy_directory 
+        $<TARGET_FILE_DIR:QCefView> 
+        $<TARGET_FILE_DIR:${PROJECT_NAME}>
+  )
 
-    # Copy the webres directory to output folder
-    COMMAND ${CMAKE_COMMAND} -E copy_directory 
-      ${CMAKE_CURRENT_BINARY_DIR}/webres 
-      $<TARGET_FILE_DIR:${PROJECT_NAME}>/webres
+  add_custom_command(TARGET ${PROJECT_NAME} 
+    POST_BUILD
 
-    # Deploy the Qt Application
-    # COMMAND ${DEPLOYQT_EXECUTABLE} 
-    # --no-svg 
-    # --no-translations 
-    # --no-compiler-runtime 
-    # $<TARGET_FILE:${PROJECT_NAME}>
+      # Copy QCefView binary to output folder
+      COMMAND ${CMAKE_COMMAND} -E copy_directory 
+        $<TARGET_FILE_DIR:QCefView> 
+        $<TARGET_FILE_DIR:${PROJECT_NAME}>
+
+      # Copy the webres directory to output folder
+      COMMAND ${CMAKE_COMMAND} -E copy_directory 
+        ${CMAKE_CURRENT_BINARY_DIR}/webres 
+        $<TARGET_FILE_DIR:${PROJECT_NAME}>/webres
+
+      # Deploy the Qt Application
+      # COMMAND ${DEPLOYQT_EXECUTABLE} 
+      # --no-svg 
+      # --no-translations 
+      # --no-compiler-runtime 
+      # $<TARGET_FILE:${PROJECT_NAME}>
   )
 endif() # OS_LINUX
 

src/CMakeLists.txt

@@ -69,12 +69,17 @@ if (OS_WINDOWS)
   )
 
   add_custom_command(TARGET QCefView 
-  POST_BUILD
+    PRE_BUILD
+
+      # copy binary files of CefViewCore
+      COMMAND ${CMAKE_COMMAND} 
+        -E copy_directory 
+        "$<TARGET_FILE_DIR:CefViewWing>"
+        "$<TARGET_FILE_DIR:QCefView>"
 
-  # copy binary files of CefViewCore
-  COMMAND ${CMAKE_COMMAND} -E copy_directory 
-    "$<TARGET_FILE_DIR:CefViewWing>"
-    "$<TARGET_FILE_DIR:QCefView>"
+      # gnerate a file contain timestamp
+      COMMAND ${CMAKE_COMMAND} 
+        -E echo "/* Auto Build Trigger */" > "${CMAKE_BINARY_DIR}/auto_rebuild.cpp"
   )
 endif()  # OS_WINDOWS
 
@@ -124,12 +129,13 @@ if (OS_LINUX)
   )
 
   add_custom_command(TARGET QCefView 
-  POST_BUILD
+    PRE_BUILD
 
-  # copy binary files of CefViewCore
-  COMMAND ${CMAKE_COMMAND} -E copy_directory 
-    "$<TARGET_FILE_DIR:CefViewWing>"
-    "$<TARGET_FILE_DIR:QCefView>"
+      # copy binary files of CefViewCore
+      COMMAND ${CMAKE_COMMAND} 
+        -E copy_directory 
+        "$<TARGET_FILE_DIR:CefViewWing>"
+        "$<TARGET_FILE_DIR:QCefView>"
   )
 endif()  # OS_LINUX
 
@@ -188,18 +194,20 @@ if (OS_MACOS)
       XCODE_ATTRIBUTE_GCC_C_LANGUAGE_STANDARD                     "c99"         # -std=c99
   )
 
-  add_custom_command(
-    TARGET QCefView
+  add_custom_command(TARGET QCefView
     PRE_BUILD
 
-    #copy the CefViewWing*.app to resource directory
-    COMMAND cp -a
-    "$<TARGET_BUNDLE_DIR:CefViewWing>/../"
-    "$<TARGET_FILE_DIR:QCefView>/Resources/"
-
-    #sign the cef framework
-    COMMAND codesign --force --sign - 
-    "$<TARGET_BUNDLE_DIR:QCefView>/Resources/Chromium Embedded Framework.framework"
+      #copy the CefViewWing*.app to resource directory
+      COMMAND cp 
+        -a
+        "$<TARGET_BUNDLE_DIR:CefViewWing>/../"
+        "$<TARGET_FILE_DIR:QCefView>/Resources/"
+
+      #sign the cef framework
+      COMMAND codesign 
+        --force 
+        --sign - 
+        "$<TARGET_BUNDLE_DIR:QCefView>/Resources/Chromium Embedded Framework.framework"
   )
 endif()  # OS_MACOS
 

src/details/QCefConfigPrivate.cpp

@@ -29,8 +29,23 @@ QCefConfigPrivate::QCefConfigPrivate()
 void
 QCefConfigPrivate::CopyToCefSettings(const QCefConfig* config, CefSettings* settings)
 {
-  if (!config || !settings)
+  // validate input target setting parameter
+  if (!settings) {
+    // nothing to do but return
     return;
+  }
+
+  // validate the input source config parameter
+  if (!config) {
+    // just copy the mandatory fields
+    QCefConfigPrivate cfg;
+#if !defined(Q_OS_MACOS)
+    CefString(&settings->browser_subprocess_path) = cfg.browserSubProcessPath_;
+    CefString(&settings->resources_dir_path) = cfg.resourceDirectoryPath_;
+    CefString(&settings->locales_dir_path) = cfg.localesDirectoryPath_;
+#endif
+    return;
+  }
 
 #if !defined(Q_OS_MACOS)
   if (!config->d_ptr->browserSubProcessPath_.empty())

src/details/QCefViewPrivate.cpp

@@ -133,9 +133,7 @@ QCefViewPrivate::createCefBrowser(QCefView* view, const QString url, const QCefS
 
   // create the browser settings
   CefBrowserSettings browserSettings;
-  if (setting) {
-    QCefSettingPrivate::CopyToCefBrowserSettings(setting, &browserSettings);
-  }
+  QCefSettingPrivate::CopyToCefBrowserSettings(setting, &browserSettings);
 
   // create browser object
   bool success = CefBrowserHost::CreateBrowser(window_info,       // window info

src/linux/details/QCefContextPrivate_linux.cpp

@@ -7,8 +7,7 @@ QCefContextPrivate::initializeCef(const QCefConfig* config)
 {
   // Build CefSettings
   CefSettings cef_settings;
-  if (config)
-    QCefConfigPrivate::CopyToCefSettings(config, &cef_settings);
+  QCefConfigPrivate::CopyToCefSettings(config, &cef_settings);
 
   // fixed values
   cef_settings.pack_loading_disabled = false;

src/mac/details/QCefContextPrivate_mac.mm

@@ -171,8 +171,7 @@ - (void)_swizzled_run {
 
   // Build CefSettings
   CefSettings cef_settings;
-  if (config)
-    QCefConfigPrivate::CopyToCefSettings(config, &cef_settings);
+  QCefConfigPrivate::CopyToCefSettings(config, &cef_settings);
 
   // fixed values
   CefString(&cef_settings.framework_dir_path) = cefFrameworkPath();

src/win/details/QCefContextPrivate_win.cpp

@@ -10,8 +10,7 @@ QCefContextPrivate::initializeCef(const QCefConfig* config)
 
   // Build CefSettings
   CefSettings cef_settings;
-  if (config)
-    QCefConfigPrivate::CopyToCefSettings(config, &cef_settings);
+  QCefConfigPrivate::CopyToCefSettings(config, &cef_settings);
 
   // fixed values
   cef_settings.pack_loading_disabled = false;
@@ -26,7 +25,7 @@ QCefContextPrivate::initializeCef(const QCefConfig* config)
   cef_settings.no_sandbox = true;
 #endif
 
-  // Initialize CEF.
+  // Initialize CEF
   auto cmdArgs = QCefConfigPrivate::GetCommandLineArgs(config);
   auto appDelegate = std::make_shared<CCefAppDelegate>(this, cmdArgs);
   auto bridgeObjectName = config ? config->bridgeObjectName().toStdString() : std::string();