Merge pull request #4549 from vigsterkr/macos-fixes-qt6

minor fixes when compiling with qt6
mixxxdj · Dec 6, 2021 · 7531b1f · 7531b1f
2 parents 8fefbd0 + bd9645c
commit 7531b1f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -80,7 +80,7 @@ option(QT6 "Build with Qt6" OFF)
 if(APPLE)
   if(QT6)
     # Minimum macOS version supported by Qt 6
-    set(CMAKE_OSX_DEPLOYMENT_TARGET 10.14 CACHE STRING "Minimum macOS version the build will be able to run on" FORCE)
+    set(CMAKE_OSX_DEPLOYMENT_TARGET 10.15 CACHE STRING "Minimum macOS version the build will be able to run on" FORCE)
   else()
     # Minimum macOS version supported by Qt 5.12
     set(CMAKE_OSX_DEPLOYMENT_TARGET 10.12 CACHE STRING "Minimum macOS version the build will be able to run on" FORCE)

diff --git a/src/util/db/sqlstringformatter.cpp b/src/util/db/sqlstringformatter.cpp
@@ -14,7 +14,7 @@ QString SqlStringFormatter::format(
         return value; // unformatted
     }
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-    QSqlField stringField(QString(), QMetaType(QMetaType::QString));
+    QSqlField stringField{QString(), QMetaType(QMetaType::QString)};
 #else
     QSqlField stringField(QString(), QVariant::String);
 #endif