Skip to content

G
gamera_videos_no_ui
Commit 1716236d by 郭峰
Options

Merge branch 'release' into 'feature/mqtt-feature' 

# Conflicts:
#   gamera_videos.pro
parents 758b1d7c 7ee90995
Showing with 4 additions and 1 deletions
gamera_videos.pro
...@@ -14,7 +14,6 @@ TEMPLATE = app ...@@ -14,7 +14,6 @@ TEMPLATE = app
DEFINES += QT_DEPRECATED_WARNINGS DEFINES += QT_DEPRECATED_WARNINGS
DEFINES += APP_VERSION=\\\"1.3.0\\\" DEFINES += APP_VERSION=\\\"1.3.0\\\"
QMAKE_LIBDIR += /usr/local/lib QMAKE_LIBDIR += /usr/local/lib
INCLUDEPATH+=/usr/local/include/opencv4 INCLUDEPATH+=/usr/local/include/opencv4
...@@ -131,3 +130,7 @@ qnx: target.path = /tmp/$${TARGET}/bin ...@@ -131,3 +130,7 @@ qnx: target.path = /tmp/$${TARGET}/bin
else: unix:!android: target.path = /opt/$${TARGET}/bin else: unix:!android: target.path = /opt/$${TARGET}/bin
!isEmpty(target.path): INSTALLS += target !isEmpty(target.path): INSTALLS += target
#RESOURCES += \
# BG.qrc
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment