Skip to content

minor fixes when compiling with qt6 #4549

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
uklotzde merged 2 commits into from
Dec 6, 2021
Merged

minor fixes when compiling with qt6 #4549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc734b1
minor fixes when compiling with qt6
vigsterkr Dec 2, 2021
bd9645c
Update src/util/db/sqlstringformatter.cpp
vigsterkr Dec 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/util/db/sqlstringformatter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)};
Comment thread
Swiftb0y marked this conversation as resolved.
#else
QSqlField stringField(QString(), QVariant::String);
#endif
Expand Down