Merge branch 'v2.1'

This commit is contained in:
Harald Sitter 2018-03-22 12:16:44 +01:00
commit 3e6a86b6b8

View File

@ -5,11 +5,11 @@ CONFIG *= qt
LINKAGE = LINKAGE =
exists($$QCA_LIBDIR/qca.framework) { exists($$QCA_LIBDIR/@QCA_LIB_NAME@.framework) {
QMAKE_CXXFLAGS += -F$$QCA_LIBDIR QMAKE_CXXFLAGS += -F$$QCA_LIBDIR
LIBS *= -F$$QCA_LIBDIR LIBS *= -F$$QCA_LIBDIR
INCLUDEPATH += $$QCA_LIBDIR/qca.framework/Headers INCLUDEPATH += $$QCA_LIBDIR/@QCA_LIB_NAME@.framework/Headers
LINKAGE = -framework qca LINKAGE = -framework @QCA_LIB_NAME@
} }
# else, link normally # else, link normally