Browse Source

Merge pull request #6274

begasus (2):
      feat(haiku): Don't use fstack-protector on Haiku
      feat(haiku): Haiku doesn't use sys/errno.h
reviewable/pr6267/r2
Anthony Bilinski 5 years ago
parent
commit
5bb89f3e0b
No known key found for this signature in database
GPG Key ID: 2AA8E0DA1B31FB3C
  1. 2
      CMakeLists.txt
  2. 2
      src/widget/qrwidget.cpp

2
CMakeLists.txt

@ -104,7 +104,7 @@ if (COMPILER_SUPPORTS_WDATE_TIME) @@ -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()

2
src/widget/qrwidget.cpp

@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
#include <QPainter>
#include <qrencode.h>
#ifdef Q_OS_WIN32
#if defined(Q_OS_WIN32) || defined(Q_OS_HAIKU)
#include <errno.h>
#else
#include <sys/errno.h>

Loading…
Cancel
Save