mirror of
https://github.com/Fishwaldo/qt-openzwave.git
synced 2025-03-16 03:51:25 +00:00
build updates
This commit is contained in:
parent
a753cd2a03
commit
17bfdbb59e
5 changed files with 38 additions and 15 deletions
|
@ -5,7 +5,6 @@
|
|||
#include <QtRemoteObjects>
|
||||
#include "qt-openzwave_global.h"
|
||||
#include "qtozwmanager.h"
|
||||
#include "websocketiodevice.h"
|
||||
|
||||
class QTOPENZWAVESHARED_EXPORT QTOpenZwave : public QObject
|
||||
{
|
||||
|
|
|
@ -14,7 +14,7 @@ TEMPLATE = lib
|
|||
VERSION = 1.0.0
|
||||
|
||||
CONFIG += silent file_copies
|
||||
|
||||
CONFIG -= silent
|
||||
!versionAtLeast(QT_VERSION, 5.11.2):error("Use at least Qt version 5.11.2")
|
||||
|
||||
include(../qt-openzwave.pri)
|
||||
|
@ -82,7 +82,19 @@ unix {
|
|||
}
|
||||
|
||||
macx {
|
||||
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.14
|
||||
# QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.11
|
||||
FRAMEWORK_HEADERS.version = Versions
|
||||
FRAMEWORK_HEADERS.files = include/qt-openzwave/qtopenzwave.h include/qt-openzwave/qtozwmanager.h \
|
||||
include/qt-openzwave/qtozwproxymodels.h include/qt-openzwave/rep_qtozwmanager_source.h \
|
||||
include/qt-openzwave/qtozw_pods.h include/qt-openzwave/qtozwvalueidmodel.h \
|
||||
include/qt-openzwave/qtozwassociationmodel.h include/qt-openzwave/qtozwnodemodel.h \
|
||||
include/qt-openzwave/rep_qtozwmanager_replica.h include/qt-openzwave_global.h
|
||||
FRAMEWORK_HEADERS.path = Headers
|
||||
|
||||
QMAKE_BUNDLE_DATA += FRAMEWORK_HEADERS
|
||||
|
||||
QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
|
||||
CONFIG +=lib_bundle
|
||||
}
|
||||
|
||||
message(" ")
|
||||
|
|
|
@ -5,9 +5,6 @@ QT += remoteobjects
|
|||
CONFIG += c++11 console silent
|
||||
CONFIG -= app_bundle
|
||||
|
||||
LIBS += -L../qt-openzwave/ -lqt-openzwave -lresolv
|
||||
INCLUDEPATH += ../qt-openzwave/include
|
||||
|
||||
include(../qt-openzwave.pri)
|
||||
|
||||
# The following define makes your compiler emit warnings if you use
|
||||
|
@ -32,3 +29,13 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin
|
|||
|
||||
HEADERS += \
|
||||
qtozwdaemon.h
|
||||
|
||||
LIBS += -lresolv
|
||||
macx {
|
||||
QMAKE_CXXFLAGS += -F../qt-openzwave/
|
||||
LIBS += -F../qt-openzwave/ -framework qt-openzwave
|
||||
ICON = res/ozw_logo.icns
|
||||
} else {
|
||||
LIBS += -L../qt-openzwave/ -lqt-openzwave
|
||||
INCLUDEPATH += ../qt-openzwave/qt-openzwave/include/
|
||||
}
|
||||
|
|
|
@ -96,6 +96,7 @@ void MainWindow::QTOZW_Ready() {
|
|||
QItemSelectionModel *selectNodeModel = this->ui->nodeView->selectionModel();
|
||||
|
||||
QAbstractItemModelTester *nodeTester = new QAbstractItemModelTester(this->m_qtozwmanager->getNodeModel(), QAbstractItemModelTester::FailureReportingMode::Fatal, this);
|
||||
Q_UNUSED(nodeTester)
|
||||
|
||||
QTOZW_proxyValueModel *proxyUserValueModel = new QTOZW_proxyValueModel(this);
|
||||
proxyUserValueModel->setSourceModel(this->m_qtozwmanager->getValueModel());
|
||||
|
@ -116,7 +117,7 @@ void MainWindow::QTOZW_Ready() {
|
|||
this->ui->userView->setFrameShape(QFrame::NoFrame);
|
||||
|
||||
QAbstractItemModelTester *valueTester = new QAbstractItemModelTester(this->m_qtozwmanager->getValueModel(), QAbstractItemModelTester::FailureReportingMode::Fatal, this);
|
||||
|
||||
Q_UNUSED(valueTester)
|
||||
|
||||
QTOZW_proxyValueModel *proxyConfigValueModel = new QTOZW_proxyValueModel(this);
|
||||
proxyConfigValueModel->setSourceModel(this->m_qtozwmanager->getValueModel());
|
||||
|
@ -169,7 +170,7 @@ void MainWindow::QTOZW_Ready() {
|
|||
|
||||
|
||||
//QAbstractItemModelTester *associationTester = new QAbstractItemModelTester(this->m_qtozwmanager->getAssociationModel(), QAbstractItemModelTester::FailureReportingMode::Fatal, this);
|
||||
|
||||
//Q_UNSED(associationTester)
|
||||
}
|
||||
|
||||
void MainWindow::valueAdded(quint64 vidKey) {
|
||||
|
|
|
@ -1,19 +1,13 @@
|
|||
|
||||
QT += widgets remoteobjects testlib
|
||||
|
||||
CONFIG += silent
|
||||
#CONFIG += silent
|
||||
DEFINES += remote
|
||||
|
||||
LIBS += -L../qt-openzwave/ -lqt-openzwave -lresolv
|
||||
INCLUDEPATH += ../qt-openzwave/include/
|
||||
|
||||
include(../qt-openzwave.pri)
|
||||
|
||||
|
||||
macx {
|
||||
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.14
|
||||
ICON = res/ozw_logo.icns
|
||||
}
|
||||
|
||||
unix {
|
||||
QMAKE_POST_LINK += "if [ ! -e config ]; then ln -s $$OZW_LIB_PATH/config config; fi"
|
||||
|
@ -43,3 +37,13 @@ DISTFILES +=
|
|||
|
||||
RESOURCES += \
|
||||
simpleclient.qrc
|
||||
|
||||
LIBS += -lresolv
|
||||
macx {
|
||||
QMAKE_CXXFLAGS += -F../qt-openzwave/
|
||||
LIBS += -F../qt-openzwave/ -framework qt-openzwave
|
||||
ICON = res/ozw_logo.icns
|
||||
} else {
|
||||
LIBS += -L../qt-openzwave/ -lqt-openzwave
|
||||
INCLUDEPATH += ../qt-openzwave/qt-openzwave/include/
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue