diff --git a/CMakeLists.txt b/CMakeLists.txt index ff3f81b9a..1aa47bcb1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -104,7 +104,7 @@ if (COMPILER_SUPPORTS_WDATE_TIME) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wdate-time") endif() -if (NOT WIN32) +if (NOT WIN32 AND NOT HAIKU) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-all") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wstack-protector") endif() diff --git a/src/widget/qrwidget.cpp b/src/widget/qrwidget.cpp index fd298692f..7656a2e54 100644 --- a/src/widget/qrwidget.cpp +++ b/src/widget/qrwidget.cpp @@ -25,7 +25,7 @@ #include #include -#ifdef Q_OS_WIN32 +#if defined(Q_OS_WIN32) || defined(Q_OS_HAIKU) #include #else #include