make Qt6 only, remove Core5Compat, update for NFC, update Dark Mode

.github/workflows/mac-build.yml

@@ -31,8 +31,8 @@ env:
   HOMEBREW_NO_AUTO_UPDATE: 1
   HOMEBREW_NO_INSTALL_CLEANUP: 1
   MACOSX_DEPLOYMENT_TARGET: 11
-  DOWNLOADQT: https://github.com/kevinhendricks/BuildSigilOnMac/releases/download/for_sigil_1.0.0/Qt662.tar.xz
-  QT: Qt662
+  DOWNLOADQT: https://github.com/kevinhendricks/BuildSigilOnMac/releases/download/for_sigil_1.0.0/Qt672.tar.xz
+  QT: Qt672
 
 jobs:
   build:

.github/workflows/reset-mac-caches.txt

@@ -6,3 +6,4 @@ cleared cache on 08 September 2023
 cleared cache on 07 October 2023
 cleared cache on 15 February 2024
 cleared cache on 26 April 2024
+cleared cache on 25 July 2024

AppearanceWidget.cpp

@@ -1,6 +1,6 @@
 /************************************************************************
 **
-**  Copyright (C) 2019-2020  Kevin B. Hendricks, Stratford Ontario Canada
+**  Copyright (C) 2019-2024  Kevin B. Hendricks, Stratford Ontario Canada
 **  Copyright (C) 2019-2020  Doug Massay
 **  Copyright (C) 2012       John Schember <[email protected]>
 **  Copyright (C) 2012       Grant Drake
@@ -36,15 +36,10 @@
 #include "Utility.h"
 
 AppearanceWidget::AppearanceWidget()
-    : m_isHighDPIComboEnabled(true)
+    : m_isHighDPIComboEnabled(false)
 {
-
-#if defined(Q_OS_MAC) || QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-    // Disable the HighDPI combobox on Mac
-    // Effectively an isMacOS runtime check
-    // Also needed if Qt >= 6.0.0
+    // Disable the HighDPI combobox on all platforms under Qt6
     m_isHighDPIComboEnabled = false;
-#endif
 
     ui.setupUi(this);
 
@@ -93,11 +88,7 @@ PreferencesWidget::ResultActions AppearanceWidget::saveSettings()
     settings.setMainMenuIconSize(double(ui.iconSizeSlider->value())/10);
 
     // WV settings can be globally changed and will take effect immediately
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-    QWebEngineSettings *web_settings = QWebEngineSettings::defaultSettings();
-#else
     QWebEngineSettings *web_settings = QWebEngineProfile::defaultProfile()->settings();
-#endif
     web_settings->setFontSize(QWebEngineSettings::DefaultFontSize,   WVAppearance.font_size);
     web_settings->setFontFamily(QWebEngineSettings::StandardFont,    WVAppearance.font_family_standard);
     web_settings->setFontFamily(QWebEngineSettings::SerifFont,       WVAppearance.font_family_serif);

CMakeLists.txt

@@ -46,7 +46,7 @@ set( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib )
 set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib )
 
 set( PAGEEDIT_MAJOR_VERSION 2 )
-set( PAGEEDIT_MINOR_VERSION 2 )
+set( PAGEEDIT_MINOR_VERSION 3 )
 set( PAGEEDIT_REVISION_VERSION 0 )
 set( PAGEEDIT_FULL_VERSION ${PAGEEDIT_MAJOR_VERSION}.${PAGEEDIT_MINOR_VERSION}.${PAGEEDIT_REVISION_VERSION} )
 
@@ -70,12 +70,5 @@ endif()
 
 add_subdirectory( gumbo_subtree/src )
 
-# Pull in th proper cmake file depending on whether
-# a qt5 or qt6 build was requested (defaults to qt5)
-
-if (${USE_QT5})
-    include(CMakeLists5.txt)
-else()
-    include(CMakeLists6.txt)
-endif()
+include(CMakeLists6.txt)