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

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

View file

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

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"
exit 1
fi
if [ ! -f $1/Contents/Frameworks/qt-openzwave.framework/qt-openzwave ]; then
echo "$1/Contents/Frameworks/qt-openzwave.framework/qt-openzwave doens't exist"
if [ ! -f $1/Contents/Frameworks/libqt-openzwave.1.dylib ]; then
echo "$1/Contents/Frameworks/libqt-openzwave.1.dylib doens't exist"
exit 1
fi
if [ ! -f $2/manufacturer_specific.xml ]; then
@ -15,7 +15,7 @@ if [ ! -f $3/bin/macdeployqt ]; then
echo "$3/bin/macdeployqt does't exist"
exit 1
fi
PATH=`otool -L $1/Contents/Frameworks/qt-openzwave.framework/qt-openzwave | grep libopenzwave | awk '{print $1}'`
/usr/bin/install_name_tool -change $PATH "@rpath/${PATH##*/}" $1/Contents/Frameworks/qt-openzwave.framework/qt-openzwave
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/libqt-openzwave.1.dylib
/bin/cp -r $2 $1/Contents/Resources/config/
echo "To Finish Please Run '$3/bin/macdeployqt $1 -verbose=2 -always-overwrite'"

View file

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

View file

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

View file

@ -10,7 +10,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
TARGET = ozwadmin-widgets
TEMPLATE = lib
CONFIG += staticlib
CONFIG += staticlib silent
SOURCES += widgets.cpp \
@ -31,55 +31,6 @@ HEADERS += widgets.h \
bitsetwidget.h \
node_delegate.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/qteditorfactory.h \
propertybrowser/qtgroupboxpropertybrowser.h \

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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