Merge branch 'yoctoIntegration'
This commit is contained in:
commit
3d3bc88269
@ -4,6 +4,8 @@ QT +=network
|
|||||||
# for TCP-IP
|
# for TCP-IP
|
||||||
|
|
||||||
TARGET = CArunGui
|
TARGET = CArunGui
|
||||||
|
TEMPLATE = app
|
||||||
|
|
||||||
VERSION = "1.0.0"
|
VERSION = "1.0.0"
|
||||||
|
|
||||||
DESTDIR=$${_PRO_FILE_PWD_}/../build
|
DESTDIR=$${_PRO_FILE_PWD_}/../build
|
||||||
@ -50,7 +52,3 @@ HEADERS += \
|
|||||||
datei.h \
|
datei.h \
|
||||||
plugin.h
|
plugin.h
|
||||||
|
|
||||||
# Default rules for deployment.
|
|
||||||
qnx: target.path = /tmp/$${TARGET}/bin
|
|
||||||
else: unix:!android: target.path = /opt/$${TARGET}/bin
|
|
||||||
!isEmpty(target.path): INSTALLS += target
|
|
||||||
|
@ -126,9 +126,3 @@ SOURCES += \
|
|||||||
# version.variable_out = HEADERS
|
# version.variable_out = HEADERS
|
||||||
# QMAKE_EXTRA_COMPILERS += version
|
# QMAKE_EXTRA_COMPILERS += version
|
||||||
# QMAKE_CLEAN += $${PWD}/include/version.h
|
# QMAKE_CLEAN += $${PWD}/include/version.h
|
||||||
|
|
||||||
|
|
||||||
# Default rules for deployment.
|
|
||||||
qnx: target.path = /tmp/$${TARGET}/bin
|
|
||||||
else: unix:!android: target.path = /opt/$${TARGET}/bin
|
|
||||||
!isEmpty(target.path): INSTALLS += target
|
|
||||||
|
@ -4,6 +4,8 @@ QT +=network
|
|||||||
# for TCP-IP
|
# for TCP-IP
|
||||||
|
|
||||||
TARGET = dCArun
|
TARGET = dCArun
|
||||||
|
TEMPLATE = app
|
||||||
|
|
||||||
VERSION = "1.0.0"
|
VERSION = "1.0.0"
|
||||||
|
|
||||||
DESTDIR=$${_PRO_FILE_PWD_}/../build
|
DESTDIR=$${_PRO_FILE_PWD_}/../build
|
||||||
@ -53,8 +55,3 @@ HEADERS += \
|
|||||||
win01_com.h \
|
win01_com.h \
|
||||||
datei.h \
|
datei.h \
|
||||||
plugin.h
|
plugin.h
|
||||||
|
|
||||||
# Default rules for deployment.
|
|
||||||
qnx: target.path = /tmp/$${TARGET}/bin
|
|
||||||
else: unix:!android: target.path = /opt/$${TARGET}/bin
|
|
||||||
!isEmpty(target.path): INSTALLS += target
|
|
||||||
|
Loading…
Reference in New Issue
Block a user