1
0
mirror of https://github.com/jaredtao/TaoQuick.git synced 2025-01-31 21:22:58 +08:00

update for bundle

This commit is contained in:
jared 2019-08-03 21:26:38 +08:00
parent a10d9f7f6b
commit 3004676bca
6 changed files with 23 additions and 18 deletions

11
Common/BundleCommon.pri Normal file
View File

@ -0,0 +1,11 @@
isEmpty(TaoBundlePri) {
TaoBundlePri=1
BundlePath=
macos{
CONFIG(debug, debug|release){
CONFIG -=app_bundle
} else {
BundlePath=TaoQuickApp.app/Contents/MacOS/
}
}
}

View File

@ -21,7 +21,7 @@ RESOURCES += \
CONFIG(debug, debug|release){
tgt=$$absolute_path($${_PRO_FILE_PWD_}/../../bin/debug/TaoPlugin)
} else {
tgt=$$absolute_path($${_PRO_FILE_PWD_}/../../bin/release/TaoPlugin)
tgt=$$absolute_path($${_PRO_FILE_PWD_}/../../bin/release/$${BundlePath}TaoPlugin)
}
win32 {
tgt ~= s,/,\\\\,g

View File

@ -1,3 +1,4 @@
HEADERS += $$PWD/Src/ITaoQuickPlugin.h
INCLUDEPATH +=$$PWD/Src
include($$PWD/../../common/TaoVersion.pri)
include($$PWD/../../common/TaoVersion.pri)
include($$PWD/../../common/BundleCommon.pri)

View File

@ -1,5 +1,5 @@
TEMPLATE = app
TARGET = TaoQuickDemo
TARGET = TaoQuickApp
QT += qml quick
CONFIG += plugin c++14 qtquickcompiler
@ -21,6 +21,7 @@ win32 {
macos {
ICON = milk.icns
}
CONFIG(debug,debug|release){
DESTDIR = $$absolute_path($${_PRO_FILE_PWD_}/../../bin/debug/)
MOC_DIR = build/debug/moc

View File

@ -1,6 +1,6 @@
QT += core gui qml
TARGET = $$qtLibraryTarget(TaoQuick)
TARGET = $$qtLibraryTarget(TaoQuickPlugin)
TEMPLATE = lib
CONFIG += plugin
msvc {
@ -21,7 +21,7 @@ RESOURCES += \
CONFIG(debug, debug|release){
tgt=$$absolute_path($${_PRO_FILE_PWD_}/../../bin/debug/TaoPlugin)
} else {
tgt=$$absolute_path($${_PRO_FILE_PWD_}/../../bin/release/TaoPlugin)
tgt=$$absolute_path($${_PRO_FILE_PWD_}/../../bin/release/$${BundlePath}TaoPlugin)
}
win32 {
tgt ~= s,/,\\\\,g

View File

@ -6,14 +6,10 @@ QT += qml quick
CONFIG += plugin c++11 qtquickcompiler
uri = TaoQuick
BundlePath=
macos{
CONFIG(debug, debug|release){
CONFIG -=app_bundle
} else {
BundlePath=TaoQuickDemo.app/Contents/MacOS/
}
}
include(../../common/TaoVersion.pri)
include(../../common/BundleCommon.pri)
include(Qml/TaoQuickDesigner.pri)
include(TaoQuick.pri)
CONFIG(debug, debug|release){
DESTDIR = $$absolute_path($${_PRO_FILE_PWD_}/../../bin/debug/$${BundlePath}$${uri})
@ -21,11 +17,7 @@ CONFIG(debug, debug|release){
DESTDIR = $$absolute_path($${_PRO_FILE_PWD_}/../../bin/release/$${BundlePath}$${uri})
}
include(../../common/TaoVersion.pri)
include(Qml/TaoQuickDesigner.pri)
include(TaoQuick.pri)
build_pass:!equals(_PRO_FILE_PWD_, $$DESTDIR) {
!equals(_PRO_FILE_PWD_, $$DESTDIR) {
copy_qmldir.target = $$DESTDIR/qmldir
copy_qmldir.depends = $$_PRO_FILE_PWD_/qmldir
win32 {