GitHub-Mirror/ozw-admin
2
0
Fork 0
mirror of https://github.com/Fishwaldo/ozw-admin.git synced 2025-03-15 19:31:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove these reduntant files, and fix build so its using dylibs not frameworks

Browse source
This commit is contained in:
Justin Hammond 2019-06-17 13:56:55 +08:00
parent 1447480163
commit b92b10b99c
55 changed files with 22 additions and 122 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
devicedb-lib/devicedb-lib.pro
View file

@ -10,7 +10,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
TARGET = devicedb-lib TARGET = devicedb-lib
TEMPLATE = lib TEMPLATE = lib
CONFIG += staticlib CONFIG += staticlib silent

8
osxmakebundle.sh
View file

@ -3,8 +3,8 @@ if [ $# -lt 3 ]; then
echo "Please Provide the path to the App Bundle and OZW Config Directory and QT Directories" echo "Please Provide the path to the App Bundle and OZW Config Directory and QT Directories"
exit 1 exit 1
fi fi
if [ ! -f $1/Contents/Frameworks/qt-openzwave.framework/qt-openzwave ]; then if [ ! -f $1/Contents/Frameworks/libqt-openzwave.1.dylib ]; then
echo "$1/Contents/Frameworks/qt-openzwave.framework/qt-openzwave doens't exist" echo "$1/Contents/Frameworks/libqt-openzwave.1.dylib doens't exist"
exit 1 exit 1
fi fi
if [ ! -f $2/manufacturer_specific.xml ]; then if [ ! -f $2/manufacturer_specific.xml ]; then
@ -15,7 +15,7 @@ if [ ! -f $3/bin/macdeployqt ]; then
echo "$3/bin/macdeployqt does't exist" echo "$3/bin/macdeployqt does't exist"
exit 1 exit 1
fi fi
PATH=`otool -L $1/Contents/Frameworks/qt-openzwave.framework/qt-openzwave | grep libopenzwave | awk '{print $1}'` PATH=`otool -L $1/Contents/Frameworks/libqt-openzwave.1.dylib | grep libopenzwave | awk '{print $1}'`
/usr/bin/install_name_tool -change $PATH "@rpath/${PATH##*/}" $1/Contents/Frameworks/qt-openzwave.framework/qt-openzwave /usr/bin/install_name_tool -change $PATH "@rpath/${PATH##*/}" $1/Contents/Frameworks/libqt-openzwave.1.dylib
/bin/cp -r $2 $1/Contents/Resources/config/ /bin/cp -r $2 $1/Contents/Resources/config/
echo "To Finish Please Run '$3/bin/macdeployqt $1 -verbose=2 -always-overwrite'" echo "To Finish Please Run '$3/bin/macdeployqt $1 -verbose=2 -always-overwrite'"

2
ozwadmin-main/configuration.cpp
View file

@ -5,7 +5,7 @@
#include "ui_configuration.h" #include "ui_configuration.h"
#include "propertybrowser/qtvariantproperty.h" #include "propertybrowser/qtvariantproperty.h"
#include "propertybrowser/QtTreePropertyBrowser" #include "propertybrowser/qttreepropertybrowser.h"
Configuration::Configuration(QTOZWOptions *options, QWidget *parent) : Configuration::Configuration(QTOZWOptions *options, QWidget *parent) :

30
ozwadmin-main/ozwadmin-main.pro
View file

@ -4,16 +4,15 @@
# #
#------------------------------------------------- #-------------------------------------------------
QT += core gui xml remoteobjects websockets svg QT += core gui widgets xml remoteobjects websockets svg
CONFIG += silent
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
TARGET = ../ozwadmin TARGET = ../ozwadmin
TEMPLATE = app TEMPLATE = app
SOURCES += main.cpp\ SOURCES += main.cpp\
configuration.cpp \ configuration.cpp \
mainwindow.cpp \ mainwindow.cpp \
metadatawindow.cpp \ metadatawindow.cpp \
util.cpp \ util.cpp \
logwindow.cpp logwindow.cpp
@ -28,6 +27,11 @@ FORMS += mainwindow.ui \
configuration.ui \ configuration.ui \
metadatawindow.ui metadatawindow.ui
RESOURCES += \
ozwadmin-main.qrc \
LIBS += ../devicedb-lib/libdevicedb-lib.a ../ozwadmin-widgets/libozwadmin-widgets.a LIBS += ../devicedb-lib/libdevicedb-lib.a ../ozwadmin-widgets/libozwadmin-widgets.a
INCLUDEPATH += ../devicedb-lib ../ozwadmin-widgets INCLUDEPATH += ../devicedb-lib ../ozwadmin-widgets
@ -38,20 +42,14 @@ QMAKE_EXTRA_TARGETS += ozwconfig
PRE_TARGETDEPS += config/qrc_ozwconfig.cpp PRE_TARGETDEPS += config/qrc_ozwconfig.cpp
SOURCES += config/qrc_ozwconfig.cpp SOURCES += config/qrc_ozwconfig.cpp
INCLUDEPATH += ../../qt-openzwave/qt-openzwave/include/
LIBS += -L../../qt-openzwave/qt-openzwave/ -lqt-openzwave
macx: { macx: {
QMAKE_CXXFLAGS += -F../../qt-openzwave/qt-openzwave/
LIBS += -framework IOKit -framework CoreFoundation LIBS += -framework IOKit -framework CoreFoundation
LIBS += -F../../qt-openzwave/qt-openzwave/ -framework qt-openzwave BUNDLE.files = ../../qt-openzwave/qt-openzwave/libqt-openzwave.1.dylib ../../open-zwave/libopenzwave-1.6.dylib
BUNDLE.files = ../../qt-openzwave/qt-openzwave/qt-openzwave.framework/ BUNDLE.path = Contents/Frameworks/
BUNDLE.path = Contents/Frameworks/qt-openzwave.framework/ QMAKE_BUNDLE_DATA += BUNDLE
LIBOZW.files = ../../open-zwave/libopenzwave-1.6.dylib
LIBOZW.path = Contents/Frameworks/
QMAKE_BUNDLE_DATA += BUNDLE LIBOZW
ICON = res/ozw_logo.icns ICON = res/ozw_logo.icns
} else {
LIBS += -L../../qt-openzwave/qt-openzwave/ -lqt-openzwave -L../../open-zwave/ -lopenzwave -lresolv
INCLUDEPATH += ../../qt-openzwave/qt-openzwave/include/
} }
RESOURCES += \
ozwadmin-main.qrc \

51
ozwadmin-widgets/ozwadmin-widgets.pro
View file

@ -10,7 +10,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
TARGET = ozwadmin-widgets TARGET = ozwadmin-widgets
TEMPLATE = lib TEMPLATE = lib
CONFIG += staticlib CONFIG += staticlib silent
SOURCES += widgets.cpp \ SOURCES += widgets.cpp \
@ -31,55 +31,6 @@ HEADERS += widgets.h \
bitsetwidget.h \ bitsetwidget.h \
node_delegate.h \ node_delegate.h \
nodeflagswidget.h \ nodeflagswidget.h \
propertybrowser/QtAbstractEditorFactoryBase \
propertybrowser/QtAbstractPropertyBrowser \
propertybrowser/QtAbstractPropertyManager \
propertybrowser/QtBoolPropertyManager \
propertybrowser/QtBrowserItem \
propertybrowser/QtButtonPropertyBrowser \
propertybrowser/QtCharEditorFactory \
propertybrowser/QtCharPropertyManager \
propertybrowser/QtCheckBoxFactory \
propertybrowser/QtColorEditorFactory \
propertybrowser/QtColorPropertyManager \
propertybrowser/QtCursorEditorFactory \
propertybrowser/QtCursorPropertyManager \
propertybrowser/QtDateEditFactory \
propertybrowser/QtDatePropertyManager \
propertybrowser/QtDateTimeEditFactory \
propertybrowser/QtDateTimePropertyManager \
propertybrowser/QtDoublePropertyManager \
propertybrowser/QtDoubleSpinBoxFactory \
propertybrowser/QtEnumEditorFactory \
propertybrowser/QtEnumPropertyManager \
propertybrowser/QtFlagPropertyManager \
propertybrowser/QtFontEditorFactory \
propertybrowser/QtFontPropertyManager \
propertybrowser/QtGroupBoxPropertyBrowser \
propertybrowser/QtGroupPropertyManager \
propertybrowser/QtIntPropertyManager \
propertybrowser/QtKeySequenceEditorFactory \
propertybrowser/QtKeySequencePropertyManager \
propertybrowser/QtLineEditFactory \
propertybrowser/QtLocalePropertyManager \
propertybrowser/QtPointFPropertyManager \
propertybrowser/QtPointPropertyManager \
propertybrowser/QtProperty \
propertybrowser/QtRectFPropertyManager \
propertybrowser/QtRectPropertyManager \
propertybrowser/QtScrollBarFactory \
propertybrowser/QtSizeFPropertyManager \
propertybrowser/QtSizePolicyPropertyManager \
propertybrowser/QtSizePropertyManager \
propertybrowser/QtSliderFactory \
propertybrowser/QtSpinBoxFactory \
propertybrowser/QtStringPropertyManager \
propertybrowser/QtTimeEditFactory \
propertybrowser/QtTimePropertyManager \
propertybrowser/QtTreePropertyBrowser \
propertybrowser/QtVariantEditorFactory \
propertybrowser/QtVariantProperty \
propertybrowser/QtVariantPropertyManager \
propertybrowser/qtbuttonpropertybrowser.h \ propertybrowser/qtbuttonpropertybrowser.h \
propertybrowser/qteditorfactory.h \ propertybrowser/qteditorfactory.h \
propertybrowser/qtgroupboxpropertybrowser.h \ propertybrowser/qtgroupboxpropertybrowser.h \

1
ozwadmin-widgets/propertybrowser/QtAbstractEditorFactoryBase
View file

@ -1 +0,0 @@
#include "qtpropertybrowser.h"

1
ozwadmin-widgets/propertybrowser/QtAbstractPropertyBrowser
View file

@ -1 +0,0 @@
#include "qtpropertybrowser.h"

1
ozwadmin-widgets/propertybrowser/QtAbstractPropertyManager
View file

@ -1 +0,0 @@
#include "qtpropertybrowser.h"

1
ozwadmin-widgets/propertybrowser/QtBoolPropertyManager
View file

@ -1 +0,0 @@
#include "qtpropertymanager.h"

1
ozwadmin-widgets/propertybrowser/QtBrowserItem
View file

@ -1 +0,0 @@
#include "qtpropertybrowser.h"

1
ozwadmin-widgets/propertybrowser/QtButtonPropertyBrowser
View file

@ -1 +0,0 @@
#include "qtbuttonpropertybrowser.h"

1
ozwadmin-widgets/propertybrowser/QtCharEditorFactory
View file

@ -1 +0,0 @@
#include "qteditorfactory.h"

1
ozwadmin-widgets/propertybrowser/QtCharPropertyManager
View file

@ -1 +0,0 @@
#include "qtpropertymanager.h"

1
ozwadmin-widgets/propertybrowser/QtCheckBoxFactory
View file

@ -1 +0,0 @@
#include "qteditorfactory.h"

1
ozwadmin-widgets/propertybrowser/QtColorEditorFactory
View file

@ -1 +0,0 @@
#include "qteditorfactory.h"

1
ozwadmin-widgets/propertybrowser/QtColorPropertyManager
View file

@ -1 +0,0 @@
#include "qtpropertymanager.h"

1
ozwadmin-widgets/propertybrowser/QtCursorEditorFactory
View file

@ -1 +0,0 @@
#include "qteditorfactory.h"

1
ozwadmin-widgets/propertybrowser/QtCursorPropertyManager
View file

@ -1 +0,0 @@
#include "qtpropertymanager.h"

1
ozwadmin-widgets/propertybrowser/QtDateEditFactory
View file

@ -1 +0,0 @@
#include "qteditorfactory.h"

1
ozwadmin-widgets/propertybrowser/QtDatePropertyManager
View file

@ -1 +0,0 @@
#include "qtpropertymanager.h"

1
ozwadmin-widgets/propertybrowser/QtDateTimeEditFactory
View file

@ -1 +0,0 @@
#include "qteditorfactory.h"

1
ozwadmin-widgets/propertybrowser/QtDateTimePropertyManager
View file

@ -1 +0,0 @@
#include "qtpropertymanager.h"

1
ozwadmin-widgets/propertybrowser/QtDoublePropertyManager
View file

@ -1 +0,0 @@
#include "qtpropertymanager.h"

1
ozwadmin-widgets/propertybrowser/QtDoubleSpinBoxFactory
View file

@ -1 +0,0 @@
#include "qteditorfactory.h"

1
ozwadmin-widgets/propertybrowser/QtEnumEditorFactory
View file

@ -1 +0,0 @@
#include "qteditorfactory.h"

1
ozwadmin-widgets/propertybrowser/QtEnumPropertyManager
View file

@ -1 +0,0 @@
#include "qtpropertymanager.h"

1
ozwadmin-widgets/propertybrowser/QtFlagPropertyManager
View file

@ -1 +0,0 @@
#include "qtpropertymanager.h"

1
ozwadmin-widgets/propertybrowser/QtFontEditorFactory
View file

@ -1 +0,0 @@
#include "qteditorfactory.h"

1
ozwadmin-widgets/propertybrowser/QtFontPropertyManager
View file

@ -1 +0,0 @@
#include "qtpropertymanager.h"

1
ozwadmin-widgets/propertybrowser/QtGroupBoxPropertyBrowser
View file

@ -1 +0,0 @@
#include "qtgroupboxpropertybrowser.h"

1
ozwadmin-widgets/propertybrowser/QtGroupPropertyManager
View file

@ -1 +0,0 @@
#include "qtpropertymanager.h"

1
ozwadmin-widgets/propertybrowser/QtIntPropertyManager
View file

@ -1 +0,0 @@
#include "qtpropertymanager.h"

1
ozwadmin-widgets/propertybrowser/QtKeySequenceEditorFactory
View file

@ -1 +0,0 @@
#include "qteditorfactory.h"

1
ozwadmin-widgets/propertybrowser/QtKeySequencePropertyManager
View file

@ -1 +0,0 @@
#include "qtpropertymanager.h"

1
ozwadmin-widgets/propertybrowser/QtLineEditFactory
View file

@ -1 +0,0 @@
#include "qteditorfactory.h"

1
ozwadmin-widgets/propertybrowser/QtLocalePropertyManager
View file

@ -1 +0,0 @@
#include "qtpropertymanager.h"

1
ozwadmin-widgets/propertybrowser/QtPointFPropertyManager
View file

@ -1 +0,0 @@
#include "qtpropertymanager.h"

1
ozwadmin-widgets/propertybrowser/QtPointPropertyManager
View file

@ -1 +0,0 @@
#include "qtpropertymanager.h"

1
ozwadmin-widgets/propertybrowser/QtProperty
View file

@ -1 +0,0 @@
#include "qtpropertybrowser.h"

1
ozwadmin-widgets/propertybrowser/QtRectFPropertyManager
View file

@ -1 +0,0 @@
#include "qtpropertymanager.h"

1
ozwadmin-widgets/propertybrowser/QtRectPropertyManager
View file

@ -1 +0,0 @@
#include "qtpropertymanager.h"

1
ozwadmin-widgets/propertybrowser/QtScrollBarFactory
View file

@ -1 +0,0 @@
#include "qteditorfactory.h"

1
ozwadmin-widgets/propertybrowser/QtSizeFPropertyManager
View file

@ -1 +0,0 @@
#include "qtpropertymanager.h"

1
ozwadmin-widgets/propertybrowser/QtSizePolicyPropertyManager
View file

@ -1 +0,0 @@
#include "qtpropertymanager.h"

1
ozwadmin-widgets/propertybrowser/QtSizePropertyManager
View file

@ -1 +0,0 @@
#include "qtpropertymanager.h"

1
ozwadmin-widgets/propertybrowser/QtSliderFactory
View file

@ -1 +0,0 @@
#include "qteditorfactory.h"

1
ozwadmin-widgets/propertybrowser/QtSpinBoxFactory
View file

@ -1 +0,0 @@
#include "qteditorfactory.h"

1
ozwadmin-widgets/propertybrowser/QtStringPropertyManager
View file

@ -1 +0,0 @@
#include "qtpropertymanager.h"

1
ozwadmin-widgets/propertybrowser/QtTimeEditFactory
View file

@ -1 +0,0 @@
#include "qteditorfactory.h"

1
ozwadmin-widgets/propertybrowser/QtTimePropertyManager
View file

@ -1 +0,0 @@
#include "qtpropertymanager.h"

1
ozwadmin-widgets/propertybrowser/QtTreePropertyBrowser
View file

@ -1 +0,0 @@
#include "qttreepropertybrowser.h"

1
ozwadmin-widgets/propertybrowser/QtVariantEditorFactory
View file

@ -1 +0,0 @@
#include "qtvariantproperty.h"

1
ozwadmin-widgets/propertybrowser/QtVariantProperty
View file

@ -1 +0,0 @@
#include "qtvariantproperty.h"

1
ozwadmin-widgets/propertybrowser/QtVariantPropertyManager
View file

@ -1 +0,0 @@
#include "qtvariantproperty.h"

2
ozwadmin-widgets/propertybrowser/qtpropertymanager.cpp
View file

@ -1543,7 +1543,7 @@ void QtStringPropertyManager::setReadOnly(QtProperty *property, bool readOnly)
it.value() = data; it.value() = data;
emit propertyChanged(property); emit propertyChanged(property);
emit readOnlyChanged(property, data.echoMode); emit readOnlyChanged(property, data.readOnly);
} }
/*! /*!