mirror of
https://github.com/Mahdi-zarei/nekoray.git
synced 2025-12-18 20:50:09 +08:00
fix build and deprecation warnings
This commit is contained in:
parent
306db5d7d4
commit
9c42b923f7
2
3rdparty/WinCommander.cpp
vendored
2
3rdparty/WinCommander.cpp
vendored
@ -60,7 +60,7 @@ uint WinCommander::runProcessElevated(const QString &path,
|
||||
|
||||
LPCTSTR pszParameters = (LPCTSTR)params.utf16();
|
||||
QString dir;
|
||||
if (workingDir.count() == 0)
|
||||
if (workingDir.size() == 0)
|
||||
dir = QDir::toNativeSeparators(QDir::currentPath());
|
||||
else
|
||||
dir = QDir::toNativeSeparators(workingDir);
|
||||
|
||||
4
3rdparty/ZxingQtReader.hpp
vendored
4
3rdparty/ZxingQtReader.hpp
vendored
@ -153,13 +153,13 @@ inline QList<Result> ReadBarcodes(const QImage& img, const DecodeHints& hints =
|
||||
case QImage::Format_ARGB32:
|
||||
case QImage::Format_RGB32:
|
||||
#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN
|
||||
return ImageFormat::BGRX;
|
||||
return ImageFormat::BGRA;
|
||||
#else
|
||||
return ImageFormat::XRGB;
|
||||
#endif
|
||||
case QImage::Format_RGB888: return ImageFormat::RGB;
|
||||
case QImage::Format_RGBX8888:
|
||||
case QImage::Format_RGBA8888: return ImageFormat::RGBX;
|
||||
case QImage::Format_RGBA8888: return ImageFormat::BGRA;
|
||||
case QImage::Format_Grayscale8: return ImageFormat::Lum;
|
||||
default: return ImageFormat::None;
|
||||
}
|
||||
|
||||
@ -12,8 +12,6 @@ if (NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND WIN32)
|
||||
endif ()
|
||||
|
||||
find_package(Qt6 REQUIRED COMPONENTS Widgets Network LinguistTools)
|
||||
find_package(absl REQUIRED)
|
||||
|
||||
|
||||
if (NKR_CROSS)
|
||||
set_property(TARGET Qt6::moc PROPERTY IMPORTED_LOCATION /usr/bin/moc)
|
||||
@ -269,8 +267,4 @@ target_link_libraries(nekoray PRIVATE
|
||||
${PLATFORM_LIBRARIES}
|
||||
)
|
||||
|
||||
# Link the Abseil libraries
|
||||
target_link_libraries(nekoray PRIVATE absl::base absl::strings)
|
||||
|
||||
|
||||
qt_finalize_executable(nekoray)
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
find_package(Protobuf REQUIRED)
|
||||
find_package(Protobuf CONFIG REQUIRED)
|
||||
|
||||
set(PROTO_FILES
|
||||
core/server/gen/libcore.proto
|
||||
|
||||
Loading…
Reference in New Issue
Block a user