diff options
| author | Caspar Schutijser <caspar@schutijser.com> | 2016-01-18 11:32:56 +0100 |
|---|---|---|
| committer | Caspar Schutijser <caspar@schutijser.com> | 2016-01-20 17:15:00 +0000 |
| commit | 653adff6e6f8c3c5e552290fefd4d27d8ae3f658 (patch) | |
| tree | 7932f7674a9bb39ea6227ea555816ed206785f08 | |
| parent | 03e5392ac9e8d490c3efbea4cc0a76d2a6544711 (diff) | |
| download | qt-creator-653adff6e6f8c3c5e552290fefd4d27d8ae3f658.tar.gz | |
No need for -lrt and -ldl on OpenBSD
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>
| -rw-r--r-- | share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri | 2 | ||||
| -rw-r--r-- | src/libs/sqlite/sqlite-lib.pri | 2 | ||||
| -rw-r--r-- | src/libs/sqlite/sqlite.qbs | 2 | ||||
| -rw-r--r-- | src/plugins/qmldesigner/qmldesignerplugin.pro | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri b/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri index 996f6c1295..1c50bc3770 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri @@ -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 diff --git a/src/libs/sqlite/sqlite-lib.pri b/src/libs/sqlite/sqlite-lib.pri index 35a02f55a6..5c742d19f7 100644 --- a/src/libs/sqlite/sqlite-lib.pri +++ b/src/libs/sqlite/sqlite-lib.pri @@ -6,7 +6,7 @@ contains(CONFIG, dll) { INCLUDEPATH += $$PWD -unix:LIBS += -ldl +unix:!openbsd: LIBS += -ldl include(../3rdparty/sqlite/sqlite.pri) diff --git a/src/libs/sqlite/sqlite.qbs b/src/libs/sqlite/sqlite.qbs index e223470644..2aa3e5f4c9 100644 --- a/src/libs/sqlite/sqlite.qbs +++ b/src/libs/sqlite/sqlite.qbs @@ -13,7 +13,7 @@ QtcLibrary { "SQLITE_ENABLE_COLUMN_METADATA" ]) 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 { diff --git a/src/plugins/qmldesigner/qmldesignerplugin.pro b/src/plugins/qmldesigner/qmldesignerplugin.pro index 3759ae3f4a..273b9e5cd3 100644 --- a/src/plugins/qmldesigner/qmldesignerplugin.pro +++ b/src/plugins/qmldesigner/qmldesignerplugin.pro @@ -4,7 +4,7 @@ CONFIG += exceptions INCLUDEPATH += $$PWD -unix:!osx:LIBS += -lrt # posix shared memory +unix:!openbsd:!osx: LIBS += -lrt # posix shared memory include(../../qtcreatorplugin.pri) |