Commit bb0a96a1 authored by Alessandro Portale's avatar Alessandro Portale

Wizards: Remove deployment.pri. Inline the deployment rules instead.

After having been reduced drastically a while ago, deployment.pri still
contained a fragment regarding deployment. This change inlines the 3
relevant lines into the main .pro file and reduces the size of generated
projects.

One side effect of these new qmake code lines is that if target.path is
defined before them, an install target is created also on non-"unix".

Change-Id: Id0893d563924c1ba9f9599c0bfe5218e82c16d1e
Reviewed-by: default avatarOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: default avatarAlessandro Portale <alessandro.portale@theqtcompany.com>
parent e49b0670
unix:!android {
isEmpty(target.path) {
qnx {
target.path = /tmp/$${TARGET}/bin
} else {
target.path = /opt/$${TARGET}/bin
}
export(target.path)
}
INSTALLS += target
}
export(INSTALLS)
......@@ -12,4 +12,6 @@ RESOURCES += qml.qrc
QML_IMPORT_PATH =
# Default rules for deployment.
include(deployment.pri)
qnx: target.path = /tmp/$${TARGET}/bin
else: unix:!android: target.path = /opt/$${TARGET}/bin
!isEmpty(target.path): INSTALLS += target
......@@ -87,10 +87,6 @@
{
"source": "qml.qrc"
},
{
"source": "../../../../shared/qrcdeployment.pri",
"target": "%{ProjectDirectory}/deployment.pri"
},
{
"source": "../../git.ignore",
"target": ".gitignore",
......
......@@ -10,4 +10,6 @@ RESOURCES += qml.qrc
QML_IMPORT_PATH =
# Default rules for deployment.
include(deployment.pri)
qnx: target.path = /tmp/$${TARGET}/bin
else: unix:!android: target.path = /opt/$${TARGET}/bin
!isEmpty(target.path): INSTALLS += target
......@@ -71,10 +71,6 @@
{
"source": "qml.qrc"
},
{
"source": "../../../../shared/qrcdeployment.pri",
"target": "%{ProjectDirectory}/deployment.pri"
},
{
"source": "../../git.ignore",
"target": "%{ProjectDirectory}/.gitignore",
......
......@@ -11,4 +11,6 @@ RESOURCES += qml.qrc
QML_IMPORT_PATH =
# Default rules for deployment.
include(deployment.pri)
qnx: target.path = /tmp/$${TARGET}/bin
else: unix:!android: target.path = /opt/$${TARGET}/bin
!isEmpty(target.path): INSTALLS += target
......@@ -141,10 +141,6 @@
{
"source": "qml.qrc"
},
{
"source": "../../../../shared/qrcdeployment.pri",
"target": "%{ProjectDirectory}/deployment.pri"
},
{
"source": "../../git.ignore",
"target": ".gitignore",
......
......@@ -10,4 +10,6 @@ RESOURCES += qml.qrc
QML_IMPORT_PATH =
# Default rules for deployment.
include(deployment.pri)
qnx: target.path = /tmp/$${TARGET}/bin
else: unix:!android: target.path = /opt/$${TARGET}/bin
!isEmpty(target.path): INSTALLS += target
......@@ -71,10 +71,6 @@
{
"source": "qml.qrc"
},
{
"source": "../../../../shared/qrcdeployment.pri",
"target": "%{ProjectDirectory}/deployment.pri"
},
{
"source": "../../git.ignore",
"target": "%{ProjectDirectory}/.gitignore",
......
......@@ -16,4 +16,6 @@ RESOURCES += qml.qrc
QML_IMPORT_PATH =
# Default rules for deployment.
include(deployment.pri)
qnx: target.path = /tmp/$${TARGET}/bin
else: unix:!android: target.path = /opt/$${TARGET}/bin
!isEmpty(target.path): INSTALLS += target
......@@ -162,10 +162,6 @@
{
"source": "qml.qrc"
},
{
"source": "../../../../shared/qrcdeployment.pri",
"target": "%{ProjectDirectory}/deployment.pri"
},
{
"source": "../../git.ignore",
"target": "%{ProjectDirectory}/.gitignore",
......
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