feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

No need for -lrt and -ldl on OpenBSD

Browse Source 
Change-Id: I33b29016daa950ab88632ffbc5cf54dde4c6eafa
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Caspar Schutijser
2016-01-18 11:32:56 +01:00
parent 03e5392ac9
commit 653adff6e6
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri
View File

@@ -24,7 +24,7 @@ DEFINES -= QT_NO_CAST_FROM_ASCII
DISTFILES += Info.plist DISTFILES += Info.plist
unix:!osx:LIBS += -lrt # posix shared memory unix:!openbsd:!osx: LIBS += -lrt # posix shared memory
osx { osx {
CONFIG -= app_bundle CONFIG -= app_bundle

2
src/libs/sqlite/sqlite-lib.pri
View File

@@ -6,7 +6,7 @@ contains(CONFIG, dll) {
INCLUDEPATH += $$PWD INCLUDEPATH += $$PWD
unix:LIBS += -ldl unix:!openbsd: LIBS += -ldl
include(../3rdparty/sqlite/sqlite.pri) include(../3rdparty/sqlite/sqlite.pri)

2
src/libs/sqlite/sqlite.qbs
View File

@@ -13,7 +13,7 @@ QtcLibrary {
"SQLITE_ENABLE_COLUMN_METADATA" "SQLITE_ENABLE_COLUMN_METADATA"
]) ])
cpp.optimization: "fast" cpp.optimization: "fast"
cpp.dynamicLibraries: base.concat(qbs.targetOS.contains("unix") ? ["dl"] : []) cpp.dynamicLibraries: base.concat((qbs.targetOS.contains("unix") && !qbs.targetOS.contains("openbsd")) ? ["dl"] : [])
Group { Group {

2
src/plugins/qmldesigner/qmldesignerplugin.pro
View File

@@ -4,7 +4,7 @@ CONFIG += exceptions
INCLUDEPATH += $$PWD INCLUDEPATH += $$PWD
unix:!osx:LIBS += -lrt # posix shared memory unix:!openbsd:!osx: LIBS += -lrt # posix shared memory
include(../../qtcreatorplugin.pri) include(../../qtcreatorplugin.pri)