From 544d0a8de5bc01712267b468d5a5701a5c76d0d3 Mon Sep 17 00:00:00 2001
From: "HuYingzhuo(hugo/hyzboy)" <hyzboy@outlook.com>
Date: Sat, 14 Jan 2023 18:44:28 +0800
Subject: [PATCH] support qt5/6

---
 CMCMakeModule  |  2 +-
 CMCore         |  2 +-
 CMPlatform     |  2 +-
 CMQT           |  2 +-
 CMUtil         |  2 +-
 CMakeLists.txt | 26 +++++++++++++++-----------
 Examples       |  2 +-
 ShaderBuilder  |  2 +-
 ShaderMaker    |  2 +-
 TexConv        |  2 +-
 10 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/CMCMakeModule b/CMCMakeModule
index 98f8913..cfb110c 160000
--- a/CMCMakeModule
+++ b/CMCMakeModule
@@ -1 +1 @@
-Subproject commit 98f891389a1e7c434ee5edb2b2b37b58d6ee408c
+Subproject commit cfb110c8b25e5f24c08d6b008d5ed5d76e7b576f
diff --git a/CMCore b/CMCore
index 3bc3514..d6917e9 160000
--- a/CMCore
+++ b/CMCore
@@ -1 +1 @@
-Subproject commit 3bc351435d4fb8f51cc5f890fc3ff37819ef69cd
+Subproject commit d6917e9339ca34419921ca5e3f746cdca83b6be7
diff --git a/CMPlatform b/CMPlatform
index eca08f0..c91c378 160000
--- a/CMPlatform
+++ b/CMPlatform
@@ -1 +1 @@
-Subproject commit eca08f0ae7aeaf81ab5818572b32051e16dd41a7
+Subproject commit c91c3780f42df182fdb752b8165ed41a03358949
diff --git a/CMQT b/CMQT
index 7b306e4..bf196b5 160000
--- a/CMQT
+++ b/CMQT
@@ -1 +1 @@
-Subproject commit 7b306e4c0933cdf426d533519719f2c563878da2
+Subproject commit bf196b5a695ebdbf7a3e0bd83c7875e4f60d9784
diff --git a/CMUtil b/CMUtil
index 4734a55..1cfb3d7 160000
--- a/CMUtil
+++ b/CMUtil
@@ -1 +1 @@
-Subproject commit 4734a558a159e21b468fcfee7b1a135c54a552dd
+Subproject commit 1cfb3d7c3ae58ef67dfbaff4b5c78f8236ae2541
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fe5835e..1ad98ea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,10 +7,15 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/CMCMakeModule)
 
+include(QtCommon)
 include(vulkan)
 include(math)
 include(use_cm_module)
 
+OPTION(CM_BUILD_TOOLS    OFF)
+OPTION(CM_BUILD_QT       OFF)
+option(CM_QT_EXTRA_STYLE OFF)
+
 use_cm_module(Core)
 use_cm_module(Platform)
 #use_cm_module(2D)
@@ -18,18 +23,13 @@ use_cm_module(Util)
 #use_cm_module(AssetsManage)
 use_cm_module(SceneGraph)
 
+if(CM_BUILD_QT)
+    use_cm_module(QT)
+endif()
+
 CMUtilSetup(${CMAKE_CURRENT_SOURCE_DIR}/CMUtil)
 
-OPTION(CM_BUILD_TOOLS       OFF)
-
 if(CM_BUILD_TOOLS)
-    OPTION(CM_BUILD_GUI_TOOLS   OFF)
-
-    IF(CM_BUILD_GUI_TOOLS)
-        include(QtCommon)
-
-        use_cm_module(QT)
-    ENDIF()
 
     if(WIN32)
         set(CM_MANIFEST ${CMAKE_CURRENT_SOURCE_DIR}/CMCMakeModule/cm_windows.manifest)
@@ -38,9 +38,13 @@ if(CM_BUILD_TOOLS)
     set(TEX_CONV_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/TexConv)
 
     add_subdirectory(TexConv)
-    add_subdirectory(ShaderMaker)
-    add_subdirectory(MeshConv)
+#    add_subdirectory(MeshConv)
     add_subdirectory(TextEncodeConvert)
+
+    IF(CM_BUILD_QT)
+        add_subdirectory(ShaderMaker)
+        add_subdirectory(ShaderBuilder)
+    endif(CM_BUILD_QT)
 endif(CM_BUILD_TOOLS)
 
 OPTION(CM_BUILD_EXAMPLES    OFF)
diff --git a/Examples b/Examples
index e4b140c..05ab513 160000
--- a/Examples
+++ b/Examples
@@ -1 +1 @@
-Subproject commit e4b140c55a35e1c9aa75f74e4b33d0b40ad2a066
+Subproject commit 05ab513b8b82785fad9ab501d00c00101d0074a5
diff --git a/ShaderBuilder b/ShaderBuilder
index 835186a..9b42367 160000
--- a/ShaderBuilder
+++ b/ShaderBuilder
@@ -1 +1 @@
-Subproject commit 835186a423222dd531bdca130443968a72ab1a20
+Subproject commit 9b4236724dc7b181f15b60edbc3c96fd288ad569
diff --git a/ShaderMaker b/ShaderMaker
index 767bc0c..fdc97b8 160000
--- a/ShaderMaker
+++ b/ShaderMaker
@@ -1 +1 @@
-Subproject commit 767bc0c636fa66bc9440c580dd96f574b177a21e
+Subproject commit fdc97b8823b1e20f5799205abd618a9a8a930c7b
diff --git a/TexConv b/TexConv
index 9371775..90ea040 160000
--- a/TexConv
+++ b/TexConv
@@ -1 +1 @@
-Subproject commit 937177590fa050893c41bfa8bc30f02af1b5bd3e
+Subproject commit 90ea04048329367573774e8475fae4110677af10