opt: disable Qt≤6.7 deprecated features and disable Qt deprecation wa…

…rnings
xiaoyifang · Nov 7, 2024 · 0214392 · 0214392
1 parent c864a9a
commit 0214392
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -192,6 +192,12 @@ endif ()
 
 #### Compile definitions
 
+# Disable deprecated staffs for Qt<=6.7 (Bump this if ever consider bump Qt version)
+target_compile_definitions(${GOLDENDICT} PRIVATE
+        QT_DISABLE_DEPRECATED_UP_TO=0x060700
+        QT_NO_DEPRECATED_WARNINGS
+)
+
 target_compile_definitions(${GOLDENDICT} PUBLIC
         CMAKE_USED_HACK  # temporal hack to avoid breaking qmake build
         MAKE_QTMULTIMEDIA_PLAYER

diff --git a/src/macos/macmouseover.mm b/src/macos/macmouseover.mm
@@ -88,8 +88,8 @@ static CGPoint carbonScreenPointFromCocoaScreenPoint( NSPoint cocoaPoint )
 
   UniChar *chars = new UniChar[ length ];
   CFStringGetCharacters( str, CFRangeMake( 0, length ), chars );
-
-  QString result = QString::fromUtf16( chars, length );
+  
+  QString result = QString::fromUtf16( (char16_t*)chars, length );
 
   delete[] chars;
   return result;

diff --git a/website/docs/install.md b/website/docs/install.md
@@ -31,7 +31,7 @@ Requires Windows 10 (1809 or later).
 * For ArchLinux, pre-built binary is available from [archlinuxcn's repo](https://github.com/archlinuxcn/repo/tree/master/archlinuxcn/goldendict-ng-git).
 * [Gentoo package from PG_Overlay](https://gitlab.com/Perfect_Gentleman/PG_Overlay/-/tree/master/app-text/goldendict-ng)
 
-Minimum supported "Linux" versions is supposedly the current Ubuntu LTS or Debian's old stable or Qt6.4.
+Minimum supported "Linux" version is supposedly the current Ubuntu LTS and Debian's oldstable.
 
 ## macOS