diff --git a/share/qtcreator/templates/wizards/plaincapp/cmake/wizard.xml b/share/qtcreator/templates/wizards/plaincapp/cmake/wizard.xml
deleted file mode 100644
index 4bc6964698d8f8259da45086e0570fba843bcd60..0000000000000000000000000000000000000000
--- a/share/qtcreator/templates/wizards/plaincapp/cmake/wizard.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms and
-** conditions see http://www.qt.io/terms-conditions. For further information
-** use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-****************************************************************************/
--->
-<wizard version="1" kind="project" firstpage="10" id="S.Plain C (CMake)" category="I.Projects"
- platformIndependent="true" featuresRequired="Plugin.CMakeProjectManager">
- <icon>../common/console.png</icon>
- <description>Creates a plain C project using CMake, not using the Qt library.</description>
- <displayname>Plain C Project (CMake Build)</displayname>;
- <displaycategory>Non-Qt Project</displaycategory>
- <files>
- <file source="../common/main.c" target="main.c" openeditor="true"/>
- <file source="CMakeLists.txt" openproject="true"/>
- </files>
-</wizard>
diff --git a/share/qtcreator/templates/wizards/plaincapp/common/console.png b/share/qtcreator/templates/wizards/plaincapp/common/console.png
deleted file mode 100644
index 7569a988f4a09ad0a72d7250b47db99c88471a79..0000000000000000000000000000000000000000
Binary files a/share/qtcreator/templates/wizards/plaincapp/common/console.png and /dev/null differ
diff --git a/share/qtcreator/templates/wizards/plaincapp/qbs/wizard.xml b/share/qtcreator/templates/wizards/plaincapp/qbs/wizard.xml
deleted file mode 100644
index bc6ef59d23f671cd28672592807aef3182ee27aa..0000000000000000000000000000000000000000
--- a/share/qtcreator/templates/wizards/plaincapp/qbs/wizard.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms and
-** conditions see http://www.qt.io/terms-conditions. For further information
-** use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-****************************************************************************/
--->
-<wizard version="1" kind="project" firstpage="10" id="S.Plain C (Qbs)" category="I.Projects"
- platformIndependent="true" featuresRequired="Plugin.QbsProjectManager">
- <icon>../common/console.png</icon>
- <description>Creates a plain C project using Qbs.</description>
- <displayname>Plain C Project (Qbs Build)</displayname>;
- <displaycategory>Non-Qt Project</displaycategory>
- <files>
- <file source="../common/main.c" target="main.c" openeditor="true"/>
- <file source="project.qbs" target="%ProjectName%.qbs" openproject="true"/>
- </files>
-</wizard>
diff --git a/share/qtcreator/templates/wizards/plaincapp/qmake/wizard.xml b/share/qtcreator/templates/wizards/plaincapp/qmake/wizard.xml
deleted file mode 100644
index 29447980df9291026a97f3e87fb27adbdc62339e..0000000000000000000000000000000000000000
--- a/share/qtcreator/templates/wizards/plaincapp/qmake/wizard.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms and
-** conditions see http://www.qt.io/terms-conditions. For further information
-** use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-****************************************************************************/
-
-Custom project wizard configuration example file. Note that by convention,
-the project file goes last.
-The "class" and "firstpage" attributes specify that it is a Qt 4 wizard and
-leave room for the Qt 4 target page.
--->
-<wizard version="1" kind="project"
- class="qmakeproject" firstpage="10"
- id="R.Plain C" category="I.Projects"
- featuresRequired="QtSupport.Wizards.FeatureQt">
- <icon>../common/console.png</icon>
- <description>Creates a plain C project using qmake, not using the Qt library.</description>
- <displayname>Plain C Project</displayname>;
- <displaycategory>Non-Qt Project</displaycategory>
- <files>
- <file source="../common/main.c" target="main.c" openeditor="true"/>
- <file source="project.pro" target="%ProjectName%.pro" openproject="true"/>
- </files>
-</wizard>
diff --git a/share/qtcreator/templates/wizards/plaincapp/cmake/CMakeLists.txt b/share/qtcreator/templates/wizards/projects/plainc/CMakeLists.txt
similarity index 82%
rename from share/qtcreator/templates/wizards/plaincapp/cmake/CMakeLists.txt
rename to share/qtcreator/templates/wizards/projects/plainc/CMakeLists.txt
index aad92e30c3c279bb1b85986f8ff9a3127573ceea..9001db70166bb1db30dd181b903f872cf4d1a872 100644
--- a/share/qtcreator/templates/wizards/plaincapp/cmake/CMakeLists.txt
+++ b/share/qtcreator/templates/wizards/projects/plainc/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(%ProjectName%)
+project(%{ProjectName})
cmake_minimum_required(VERSION 2.8)
aux_source_directory(. SRC_LIST)
add_executable(${PROJECT_NAME} ${SRC_LIST})
diff --git a/share/qtcreator/templates/wizards/plaincapp/qmake/project.pro b/share/qtcreator/templates/wizards/projects/plainc/file.pro
similarity index 75%
rename from share/qtcreator/templates/wizards/plaincapp/qmake/project.pro
rename to share/qtcreator/templates/wizards/projects/plainc/file.pro
index 7e6c04258a8e945b45aa4db03d2996a315faa88a..75b02a7d37b92fb6e6a4776792a80cd13d179505 100644
--- a/share/qtcreator/templates/wizards/plaincapp/qmake/project.pro
+++ b/share/qtcreator/templates/wizards/projects/plainc/file.pro
@@ -3,4 +3,4 @@ CONFIG += console c++11
CONFIG -= app_bundle
CONFIG -= qt
-SOURCES += main.c
+SOURCES += %{CFileName}
diff --git a/share/qtcreator/templates/wizards/plaincapp/qbs/project.qbs b/share/qtcreator/templates/wizards/projects/plainc/file.qbs
similarity index 90%
rename from share/qtcreator/templates/wizards/plaincapp/qbs/project.qbs
rename to share/qtcreator/templates/wizards/projects/plainc/file.qbs
index 2e30fb31c682e248529daadd8f74894a40d23042..3f178d05c0e7483a6897fa733e5f1bbdf8040432 100644
--- a/share/qtcreator/templates/wizards/plaincapp/qbs/project.qbs
+++ b/share/qtcreator/templates/wizards/projects/plainc/file.qbs
@@ -3,7 +3,7 @@ import qbs
CppApplication {
type: "application" // To suppress bundle generation on Mac
consoleApplication: true
- files: "main.c"
+ files: "%{CFileName}"
Group { // Properties for the produced executable
fileTagsFilter: product.type
diff --git a/share/qtcreator/templates/wizards/plaincapp/common/main.c b/share/qtcreator/templates/wizards/projects/plainc/main.c
similarity index 63%
rename from share/qtcreator/templates/wizards/plaincapp/common/main.c
rename to share/qtcreator/templates/wizards/projects/plainc/main.c
index 8f1edd610c6b6a097eb8518faa0a99a8f50c18d8..8192ca7faf0776620d8c55e5006e5a3a9d0b91c7 100644
--- a/share/qtcreator/templates/wizards/plaincapp/common/main.c
+++ b/share/qtcreator/templates/wizards/projects/plainc/main.c
@@ -2,6 +2,6 @@
int main(void)
{
- printf("Hello World!\n");
+ printf("Hello World!\\n");
return 0;
}
diff --git a/share/qtcreator/templates/wizards/projects/plainc/wizard.json b/share/qtcreator/templates/wizards/projects/plainc/wizard.json
new file mode 100644
index 0000000000000000000000000000000000000000..5e1828351a5b86bde413b16913c1b7e02351f7b9
--- /dev/null
+++ b/share/qtcreator/templates/wizards/projects/plainc/wizard.json
@@ -0,0 +1,115 @@
+{
+ "version": 1,
+ "kind": "project",
+ "id": "A.Plain C Application",
+ "category": "I.Projects",
+ "trDescription": "Creates a simple C application using either qmake, CMake, or Qbs to build.",
+ "trDisplayName": "Plain C Application",
+ "trDisplayCategory": "Non-Qt Project",
+ "icon": "../../global/consoleapplication.png",
+ "enabled": "%{JS: [ %{Plugins} ].indexOf('QmakeProjectManager') >= 0 || [ %{Plugins} ].indexOf('QbsProjectManager') >= 0 || [ %{Plugins} ].indexOf('CMakeProjectManager') >= 0}",
+
+ "options":
+ [
+ { "key": "ProjectFile", "value": "%{JS: '%{BuildSystem}' === 'qmake' ? '%{ProFile}' : ('%{BuildSystem}' === 'cmake' ? '%{CMakeFile}' : '%{QbsFile}')}" },
+ { "key": "ProFile", "value": "%{JS: Util.fileName('%{ProjectDirectory}/%{ProjectName}', 'pro')}" },
+ { "key": "QbsFile", "value": "%{JS: Util.fileName('%{ProjectDirectory}/%{ProjectName}', 'qbs')}" },
+ { "key": "CMakeFile", "value": "%{ProjectDirectory}/CMakeLists.txt" },
+ { "key": "CFileName", "value": "%{JS: 'main.' + Util.preferredSuffix('text/x-csrc')}" },
+ { "key": "IsTopLevelProject", "value": "%{JS: !'%{Exists:ProjectExplorer.Profile.Ids}'}" }
+ ],
+
+ "pages":
+ [
+ {
+ "trDisplayName": "Project Location",
+ "trShortTitle": "Location",
+ "typeId": "Project",
+ "data": { "trDescription": "This wizard creates an empty .pro file." }
+ },
+ {
+ "trDisplayName": "Define Build System",
+ "trShortTitle": "Build System",
+ "typeId": "Fields",
+ "data":
+ [
+ {
+ "name": "BuildSystem",
+ "trDisplayName": "Build system:",
+ "type": "ComboBox",
+ "data":
+ {
+ "index": 0,
+ "items":
+ [
+ {
+ "trKey": "qmake",
+ "value": "qmake",
+ "condition": "%{JS: [ %{Plugins} ].indexOf('QmakeProjectManager') >= 0}"
+ },
+ {
+ "trKey": "CMake",
+ "value": "cmake",
+ "condition": "%{JS: [ %{Plugins} ].indexOf('CMakeProjectManager') >= 0}"
+ },
+ {
+ "trKey": "Qbs",
+ "value": "qbs",
+ "condition": "%{JS: [ %{Plugins} ].indexOf('QbsProjectManager') >= 0}"
+ }
+ ]
+ }
+ }
+ ]
+ },
+
+ {
+ "trDisplayName": "Kit Selection",
+ "trShortTitle": "Kits",
+ "typeId": "Kits",
+ "enabled": "%{IsTopLevelProject}",
+ "data": { "projectFilePath": "%{ProjectFile}" }
+ },
+ {
+ "trDisplayName": "Project Management",
+ "trShortTitle": "Summary",
+ "typeId": "Summary"
+ }
+ ],
+ "generators":
+ [
+ {
+ "typeId": "File",
+ "data":
+ [
+ {
+ "source": "file.pro",
+ "target": "%{ProFile}",
+ "openAsProject": true,
+ "condition": "%{JS: '%{BuildSystem}' === 'qmake'}"
+ },
+ {
+ "source": "CMakeLists.txt",
+ "openAsProject": true,
+ "condition": "%{JS: '%{BuildSystem}' === 'cmake'}"
+ },
+ {
+ "source": "file.qbs",
+ "target": "%{QbsFile}",
+ "openAsProject": true,
+ "condition": "%{JS: '%{BuildSystem}' === 'qbs'}"
+ },
+ {
+ "source": "main.c",
+ "target": "%{CFileName}",
+ "openInEditor": true
+ },
+ {
+ "source": "../git.ignore",
+ "target": "%{ProjectDirectory}/.gitignore",
+ "condition": "%{JS: ! %{IsSubproject} && '%{VersionControl}' === 'G.Git'}"
+ }
+ ]
+ }
+ ]
+}