diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9762b00..a7708fb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -160,25 +160,15 @@ if(NOT FRAMELESSHELPER_NO_SUMMARY)
     message("Prefix paths: ${CMAKE_PREFIX_PATH}")
     message("Toolchain file: ${CMAKE_TOOLCHAIN_FILE}")
     message("------------------------------ Qt -------------------------------")
-    set(__qt_inst_dir)
-    if(DEFINED Qt6_DIR)
-        set(__qt_inst_dir "${Qt6_DIR}")
-    else()
-        set(__qt_inst_dir "${Qt5_DIR}")
-    endif()
-    # /whatever/Qt/6.4.0/gcc_64/lib/cmake/Qt6
-    cmake_path(GET __qt_inst_dir PARENT_PATH __qt_inst_dir)
-    cmake_path(GET __qt_inst_dir PARENT_PATH __qt_inst_dir)
-    cmake_path(GET __qt_inst_dir PARENT_PATH __qt_inst_dir)
+    query_qt_paths(SDK_DIR __qt_inst_dir)
     message("Qt SDK installation directory: ${__qt_inst_dir}")
     message("Qt SDK version: ${QT_VERSION}")
-    get_target_property(__qt_type Qt${QT_VERSION_MAJOR}::Core TYPE)
-    if(__qt_type STREQUAL "STATIC_LIBRARY")
-        set(__qt_type static)
+    query_qt_library_info(STATIC __qt_lib_type)
+    if(__qt_lib_type)
+        message("Qt SDK library type: static")
     else()
-        set(__qt_type shared)
+        message("Qt SDK library type: shared")
     endif()
-    message("Qt SDK library type: ${__qt_type}")
     message("------------------------ FramelessHelper ------------------------")
     message("FramelessHelper version: ${PROJECT_VERSION}")
     message("FramelessHelper commit hash: ${PROJECT_VERSION_COMMIT}")
diff --git a/cmake b/cmake
index 5b49622..60329b5 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 5b496224b13f31a5cc07cb48b56aed8d5e7e29de
+Subproject commit 60329b55dcfaf41da63f134a90ddce82dc9b6c4a
diff --git a/src/core/framelesshelper_win.cpp b/src/core/framelesshelper_win.cpp
index cff7389..a32a690 100644
--- a/src/core/framelesshelper_win.cpp
+++ b/src/core/framelesshelper_win.cpp
@@ -114,7 +114,7 @@ Q_GLOBAL_STATIC(Win32Helper, g_win32Helper)
 {
     // NULL handle is allowed here.
     return FRAMELESSHELPER_STRING_LITERAL("0x")
-        + QString::number(windowId, 16).toUpper();
+        + QString::number(windowId, 16).toUpper().rightJustified(8, u'0');
 }
 
 [[nodiscard]] static inline QString hwnd2str(const HWND hwnd)