GitHub-Mirror/qt-openzwave
2
0
Fork 0
mirror of https://github.com/Fishwaldo/qt-openzwave.git synced 2025-07-06 05:08:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/OpenZWave/qt-openzwave

Browse source
This commit is contained in:
Justin Hammond 2019-06-14 22:27:36 +08:00
commit 1246c27842
4 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
qt-openzwave/qt-openzwave.pro
View file

@ -99,7 +99,9 @@ macx {
QMAKE_BUNDLE_DATA += FRAMEWORK_HEADERS
QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
CONFIG +=lib_bundle
}
} else {
LIBS += -L../../open-zwave -lopenzwave
}
message(" ")
message("Summary:")

7
qt-ozwdaemon/qt-ozwdaemon.pro
View file

@ -4,8 +4,7 @@ QT += remoteobjects
CONFIG += c++11 console silent
CONFIG -= app_bundle
include(../qt-openzwave.pri)
CONFIG -= silent
# The following define makes your compiler emit warnings if you use
# any Qt feature that has been marked deprecated (the exact warnings
@ -37,5 +36,7 @@ macx {
ICON = res/ozw_logo.icns
} else {
LIBS += -L../qt-openzwave/ -lqt-openzwave
INCLUDEPATH += ../qt-openzwave/qt-openzwave/include/
INCLUDEPATH += ../qt-openzwave/include/
}
include(../qt-openzwave.pri)

2
simpleclient/main.cpp
View file

@ -53,7 +53,7 @@
#include <QRemoteObjectNode>
#include <QAbstractItemModelReplica>
#include <qt-openzwave/qtozwmanager.h>
#include "qt-openzwave/qtozwmanager.h"
#include "mainwindow.h"

10
simpleclient/simpleclient.pro
View file

@ -4,11 +4,6 @@ QT += widgets remoteobjects testlib
CONFIG += silent
DEFINES += remote
include(../qt-openzwave.pri)
unix {
QMAKE_POST_LINK += "if [ ! -e config ]; then ln -s $$OZW_LIB_PATH/config config; fi"
}
@ -48,6 +43,7 @@ macx {
QMAKE_BUNDLE_DATA += BUNDLE LIBOZW
INCLUDEPATH += ../qt-openzwave/qt-openzwave/include/
} else {
LIBS += -L../qt-openzwave/ -lqt-openzwave
INCLUDEPATH += ../qt-openzwave/qt-openzwave/include/
LIBS += -L../qt-openzwave/ -lqt-openzwave -L../../open-zwave -lopenzwave
INCLUDEPATH += ../qt-openzwave/include/
}
include(../qt-openzwave.pri)