Unverified Commit 2eb2015f authored by Tao Zhong's avatar Tao Zhong Committed by GitHub

Merge branch 'master' into develop

parents 1f07358f 631a51ca
theme: jekyll-theme-cayman
\ No newline at end of file
......@@ -136,6 +136,7 @@ RC_FILE = Resources/jpseditor.rc
ICON = Resources/jpseditor.icns
#INCLUDEPATH += $$(ROOTSYS)/include
#CONFIG(debug, debug|release) {
# DESTDIR = build/debug
#}
......@@ -148,10 +149,11 @@ ICON = Resources/jpseditor.icns
#RCC_DIR = $$DESTDIR/.qrc
#UI_DIR = $$DESTDIR/.u
demos.path = /usr/local/bin/jpseditor
demos.files = examples/*
INSTALLS += demos
target.path = /usr/local/bin/jpseditor
INSTALLS += target
INSTALLS += target
\ No newline at end of file
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