Merging master

This commit is contained in:
R. Aidan Campbell
2018-04-29 07:20:47 -07:00
8 changed files with 634 additions and 36 deletions

View File

@@ -20,20 +20,29 @@ DEFINES += QT_DEPRECATED_WARNINGS
# You can also make your code fail to compile if you use deprecated APIs.
# In order to do so, uncomment the following line.
# You can also select to disable deprecated APIs only up to a certain version of Qt.
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
SOURCES += \
main.cpp \
mainwindow.cpp \
nvhttp.cpp
main.cpp \
mainwindow.cpp \
nvhttp.cpp \
nvpairingmanager.cpp \
identitymanager.cpp
HEADERS += \
mainwindow.h \
nvhttp.h
mainwindow.h \
nvhttp.h \
nvpairingmanager.h \
identitymanager.h \
utils.h
FORMS += \
mainwindow.ui
mainwindow.ui
RESOURCES += \
resources.qrc
LIBS += \
-lssl \
-lcrypto