Merge remote-tracking branch 'origin/3.6'

Change-Id: I4e1ec4054d7364057c63e63e293a246e64afdddb
2016-01-25 13:21:11 +01:00
parent a081e8c96f 5b9350baf6
commit d18d7eaef6
17 changed files with 7462 additions and 7986 deletions
@@ -24,7 +24,7 @@ DEFINES -= QT_NO_CAST_FROM_ASCII

 DISTFILES += Info.plist

-unix:!osx:LIBS += -lrt # posix shared memory
+unix:!openbsd:!osx: LIBS += -lrt # posix shared memory

 osx {
    CONFIG -= app_bundle