Merge pull request #132 from oblivioncth/dev

Merge to master for v0.5.6.1
oblivioncth · Dec 4, 2023 · aeb3780 · aeb3780
2 parents 0d5f305 + 4a59c7b
commit aeb3780
Show file tree

Hide file tree

Showing 15 changed files with 367 additions and 81 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,14 +8,14 @@ cmake_minimum_required(VERSION 3.23.0...3.26.0)
 # avoided and only used for hotfixes. DON'T USE TRAILING
 # ZEROS IN VERSIONS
 project(Qx
-    VERSION 0.5.6
+    VERSION 0.5.6.1
     LANGUAGES CXX
     DESCRIPTION "Qt Extensions Library"
 )
 
 # Get helper scripts
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/FetchOBCMake.cmake)
-fetch_ob_cmake("v0.3.4")
+fetch_ob_cmake("v0.3.4.1")
 
 # Initialize project according to standard rules
 include(OB/Project)

diff --git a/doc/cmake/file_templates/mainpage.md.in b/doc/cmake/file_templates/mainpage.md.in
@@ -18,7 +18,7 @@ Packaging
 ----------
 Qx is provided as a CMake package containing several component libraries that roughly follow the scope and grouping of Qt modules, with Core being the primary component.
 
-See the [Components Index](modules.html) for a list of available components (**NOTE**: Some of these are platform dependent).
+See the [Components Index](topics.html) for a list of available components (**NOTE**: Some of these are platform dependent).
 
 When importing the library package with CMake it is recommended to only include the components you need for a particular application in order to minimize the size of your build.
 

diff --git a/doc/res/DoxygenLayout.xml b/doc/res/DoxygenLayout.xml
@@ -5,7 +5,11 @@
     <tab type="mainpage" visible="yes" title=""/>
     <tab type="user" url="https://github.com/oblivioncth/Qx/releases" title="Downloads"/>
 	<tab type="pages" visible="yes" title="" intro=""/>
-    <tab type="modules" visible="yes" title="Components" intro="Here is a list of the components in Qx:"/>
+    <tab type="topics" visible="yes" title="Components" intro="Here is a list of the components in Qx:"/>
+    <tab type="modules" visible="yes" title="" intro="">
+      <tab type="modulelist" visible="yes" title="" intro=""/>
+      <tab type="modulemembers" visible="yes" title="" intro=""/>
+    </tab>
     <tab type="namespacelist" visible="yes" title="Namespaces" intro=""/>
     <tab type="interfaces" visible="yes" title="">
       <tab type="interfacelist" visible="yes" title="" intro=""/>

diff --git a/doc/res/theme/doxygen-awesome/doxygen-awesome-darkmode-toggle.js b/doc/res/theme/doxygen-awesome/doxygen-awesome-darkmode-toggle.js
@@ -5,7 +5,7 @@ https://github.com/jothepro/doxygen-awesome-css
 
 MIT License
 
-Copyright (c) 2021 - 2022 jothepro
+Copyright (c) 2021 - 2023 jothepro
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/doc/res/theme/doxygen-awesome/doxygen-awesome-fragment-copy-button.js b/doc/res/theme/doxygen-awesome/doxygen-awesome-fragment-copy-button.js
@@ -5,7 +5,7 @@ https://github.com/jothepro/doxygen-awesome-css
 
 MIT License
 
-Copyright (c) 2022 jothepro
+Copyright (c) 2022 - 2023 jothepro
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/doc/res/theme/doxygen-awesome/doxygen-awesome-paragraph-link.js b/doc/res/theme/doxygen-awesome/doxygen-awesome-paragraph-link.js
@@ -5,7 +5,7 @@ https://github.com/jothepro/doxygen-awesome-css
 
 MIT License
 
-Copyright (c) 2022 jothepro
+Copyright (c) 2022 - 2023 jothepro
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/doc/res/theme/doxygen-awesome/doxygen-awesome-sidebar-only-darkmode-toggle.css b/doc/res/theme/doxygen-awesome/doxygen-awesome-sidebar-only-darkmode-toggle.css
@@ -6,7 +6,7 @@ https://github.com/jothepro/doxygen-awesome-css
 
 MIT License
 
-Copyright (c) 2021 jothepro
+Copyright (c) 2021 - 2023 jothepro
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/doc/res/theme/doxygen-awesome/doxygen-awesome-sidebar-only.css b/doc/res/theme/doxygen-awesome/doxygen-awesome-sidebar-only.css
@@ -5,7 +5,7 @@ https://github.com/jothepro/doxygen-awesome-css
 
 MIT License
 
-Copyright (c) 2021 jothepro
+Copyright (c) 2021 - 2023 jothepro
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -81,6 +81,7 @@ html {
     .ui-resizable-handle {
         cursor: default;
         width: 1px !important;
+        background: var(--separator-color);
         box-shadow: 0 calc(-2 * var(--top-height)) 0 0 var(--separator-color);
     }