diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2014-04-17 15:49:04 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-04-28 15:36:07 +0200 |
| commit | c2d20e49dc4187dba1d5dd07d11dcbc43db7ac2d (patch) | |
| tree | 6f95d34b01acea32716b6f92f6ce445bf803ec37 | |
| parent | 3728da8825c70c79e7a478c09e5cba7be65f4081 (diff) | |
| download | qt-creator-c2d20e49dc4187dba1d5dd07d11dcbc43db7ac2d.tar.gz | |
Support deployment in "plain C" and "plain C++" app wizard.
For qmake, that is. The qbs versions already have deployment support.
Change-Id: I75d9bf0a36285a5e04e0fb7f13fca304d74efdc9
Reviewed-by: hjk <hjk121@nokiamail.com>
4 files changed, 8 insertions, 0 deletions
diff --git a/share/qtcreator/templates/wizards/plaincapp/qmake/project.pro b/share/qtcreator/templates/wizards/plaincapp/qmake/project.pro index fc18d891f3..c4c300ea8b 100644 --- a/share/qtcreator/templates/wizards/plaincapp/qmake/project.pro +++ b/share/qtcreator/templates/wizards/plaincapp/qmake/project.pro @@ -4,3 +4,6 @@ CONFIG -= app_bundle CONFIG -= qt SOURCES += main.c + +include(deployment.pri) +qtcAddDeployment() diff --git a/share/qtcreator/templates/wizards/plaincapp/qmake/wizard.xml b/share/qtcreator/templates/wizards/plaincapp/qmake/wizard.xml index 0f470640c6..0d3767fb24 100644 --- a/share/qtcreator/templates/wizards/plaincapp/qmake/wizard.xml +++ b/share/qtcreator/templates/wizards/plaincapp/qmake/wizard.xml @@ -44,6 +44,7 @@ leave room for the Qt 4 target page. <displaycategory>Non-Qt Project</displaycategory> <files> <file source="../common/main.c" target="main.c" openeditor="true"/> + <file source="../../../shared/deployment.pri" target="deployment.pri"/> <file source="project.pro" target="%ProjectName%.pro" openproject="true"/> </files> </wizard> diff --git a/share/qtcreator/templates/wizards/plaincppapp/qmake/project.pro b/share/qtcreator/templates/wizards/plaincppapp/qmake/project.pro index 33a5d50528..d823412c16 100644 --- a/share/qtcreator/templates/wizards/plaincppapp/qmake/project.pro +++ b/share/qtcreator/templates/wizards/plaincppapp/qmake/project.pro @@ -4,3 +4,6 @@ CONFIG -= app_bundle CONFIG -= qt SOURCES += main.cpp + +include(deployment.pri) +qtcAddDeployment() diff --git a/share/qtcreator/templates/wizards/plaincppapp/qmake/wizard.xml b/share/qtcreator/templates/wizards/plaincppapp/qmake/wizard.xml index 125cfaf122..cec8c7f943 100644 --- a/share/qtcreator/templates/wizards/plaincppapp/qmake/wizard.xml +++ b/share/qtcreator/templates/wizards/plaincppapp/qmake/wizard.xml @@ -44,6 +44,7 @@ leave room for the Qt 4 target page. <displaycategory>Non-Qt Project</displaycategory> <files> <file source="../common/main.cpp" target="main.cpp" openeditor="true"/> + <file source="../../../shared/deployment.pri" target="deployment.pri"/> <file source="project.pro" target="%ProjectName%.pro" openproject="true"/> </files> </wizard> |