Skip to content

Commit

Permalink
Merge branch 'qt5.9' into 'master'
Browse files Browse the repository at this point in the history
[Packaging] Fix build with qt 5.9. Fixes MER#1983

See merge request mer-core/mms-engine!17
  • Loading branch information
Slava Monich committed Nov 8, 2018
2 parents 57ed1e9 + 90eb983 commit 066b547
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions mms-lib/Makefile
Expand Up @@ -54,6 +54,9 @@ SRC = \

ifeq ($(MMS_RESIZE),Qt)
SRC_CPP += mms_attachment_qt.cpp
ifeq ($(shell $(CROSS_COMPILE)gcc -std=c++11 -dM -E - < /dev/null > /dev/null 2>&1; echo $$?),0)
RESIZE_CPPFLAGS += -std=c++11
endif
endif

#
Expand Down

0 comments on commit 066b547

Please sign in to comment.