Commit 983a5a17 authored by Eike Ziller's avatar Eike Ziller

Merge remote-tracking branch 'origin/3.6' into 4.0

Change-Id: I3a69a17c920921156298cc50005b39d31e1f0a80
parents d545aaee d038a846
......@@ -6,7 +6,7 @@ contains(CONFIG, dll) {
INCLUDEPATH += $$PWD
unix:!openbsd: LIBS += -ldl
unix:!bsd: LIBS += -ldl
include(../3rdparty/sqlite/sqlite.pri)
......
......@@ -13,7 +13,7 @@ QtcLibrary {
"SQLITE_ENABLE_COLUMN_METADATA"
])
cpp.optimization: "fast"
cpp.dynamicLibraries: base.concat((qbs.targetOS.contains("unix") && !qbs.targetOS.contains("openbsd"))
cpp.dynamicLibraries: base.concat((qbs.targetOS.contains("unix") && !qbs.targetOS.contains("bsd"))
? ["dl", "pthread"] : [])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment