From a73871d91c0ff29fb8c239be31e8cba3c6ba83f1 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@theqtcompany.com>
Date: Fri, 22 Jan 2016 15:16:01 +0100
Subject: Fix wrong location of templates

Change-Id: Id7732ef0914ba69eae020feb412cbce7cf9a5902
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
---
 .../qtcreator/templates/wizards/autotest/auto.pro  |   3 +
 .../templates/wizards/autotest/autotest_24.png     | Bin 0 -> 683 bytes
 .../qtcreator/templates/wizards/autotest/main.cpp  |  18 +++++
 share/qtcreator/templates/wizards/autotest/src.pro |  13 ++++
 .../qtcreator/templates/wizards/autotest/tests.pro |   3 +
 share/qtcreator/templates/wizards/autotest/tmp.pro |  12 +++
 share/qtcreator/templates/wizards/autotest/tst.pro |  14 ++++
 .../templates/wizards/autotest/tst_src.cpp         |  58 ++++++++++++++
 .../templates/wizards/autotest/wizard.xml          |  83 +++++++++++++++++++++
 .../qtcreator/templates/wizards/autotest/auto.pro  |   3 -
 .../templates/wizards/autotest/autotest_24.png     | Bin 683 -> 0 bytes
 .../qtcreator/templates/wizards/autotest/main.cpp  |  18 -----
 .../qtcreator/templates/wizards/autotest/src.pro   |  13 ----
 .../qtcreator/templates/wizards/autotest/tests.pro |   3 -
 .../qtcreator/templates/wizards/autotest/tmp.pro   |  12 ---
 .../qtcreator/templates/wizards/autotest/tst.pro   |  14 ----
 .../templates/wizards/autotest/tst_src.cpp         |  58 --------------
 .../templates/wizards/autotest/wizard.xml          |  83 ---------------------
 18 files changed, 204 insertions(+), 204 deletions(-)
 create mode 100644 share/qtcreator/templates/wizards/autotest/auto.pro
 create mode 100644 share/qtcreator/templates/wizards/autotest/autotest_24.png
 create mode 100644 share/qtcreator/templates/wizards/autotest/main.cpp
 create mode 100644 share/qtcreator/templates/wizards/autotest/src.pro
 create mode 100644 share/qtcreator/templates/wizards/autotest/tests.pro
 create mode 100644 share/qtcreator/templates/wizards/autotest/tmp.pro
 create mode 100644 share/qtcreator/templates/wizards/autotest/tst.pro
 create mode 100644 share/qtcreator/templates/wizards/autotest/tst_src.cpp
 create mode 100644 share/qtcreator/templates/wizards/autotest/wizard.xml
 delete mode 100644 shared/qtcreator/templates/wizards/autotest/auto.pro
 delete mode 100644 shared/qtcreator/templates/wizards/autotest/autotest_24.png
 delete mode 100644 shared/qtcreator/templates/wizards/autotest/main.cpp
 delete mode 100644 shared/qtcreator/templates/wizards/autotest/src.pro
 delete mode 100644 shared/qtcreator/templates/wizards/autotest/tests.pro
 delete mode 100644 shared/qtcreator/templates/wizards/autotest/tmp.pro
 delete mode 100644 shared/qtcreator/templates/wizards/autotest/tst.pro
 delete mode 100644 shared/qtcreator/templates/wizards/autotest/tst_src.cpp
 delete mode 100644 shared/qtcreator/templates/wizards/autotest/wizard.xml

diff --git a/share/qtcreator/templates/wizards/autotest/auto.pro b/share/qtcreator/templates/wizards/autotest/auto.pro
new file mode 100644
index 0000000000..b39fef654c
--- /dev/null
+++ b/share/qtcreator/templates/wizards/autotest/auto.pro
@@ -0,0 +1,3 @@
+TEMPLATE = subdirs
+
+SUBDIRS += %TestCaseName:l%
diff --git a/share/qtcreator/templates/wizards/autotest/autotest_24.png b/share/qtcreator/templates/wizards/autotest/autotest_24.png
new file mode 100644
index 0000000000..3f52e9bf08
Binary files /dev/null and b/share/qtcreator/templates/wizards/autotest/autotest_24.png differ
diff --git a/share/qtcreator/templates/wizards/autotest/main.cpp b/share/qtcreator/templates/wizards/autotest/main.cpp
new file mode 100644
index 0000000000..3ff500decd
--- /dev/null
+++ b/share/qtcreator/templates/wizards/autotest/main.cpp
@@ -0,0 +1,18 @@
+@if "%RequireGUI%" == "true"
+#include <QApplication>
+@else
+#include <QCoreApplication>
+@endif
+
+// add necessary includes here
+
+int main(int argc, char *argv[])
+{
+@if "%RequireGUI%" == "true"
+    QApplication a(argc, argv);
+@else
+    QCoreApplication a(argc, argv);
+@endif
+
+    return a.exec();
+}
diff --git a/share/qtcreator/templates/wizards/autotest/src.pro b/share/qtcreator/templates/wizards/autotest/src.pro
new file mode 100644
index 0000000000..61fbe2a5bc
--- /dev/null
+++ b/share/qtcreator/templates/wizards/autotest/src.pro
@@ -0,0 +1,13 @@
+@if "%RequireGUI%" == "true"
+QT += core gui
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+@else
+QT -= gui
+CONFIG += console
+CONFIG -= app_bundle
+@endif
+
+TEMPLATE = app
+TARGET = %ProjectName%
+
+SOURCES += main.%CppSourceSuffix%
diff --git a/share/qtcreator/templates/wizards/autotest/tests.pro b/share/qtcreator/templates/wizards/autotest/tests.pro
new file mode 100644
index 0000000000..f927700008
--- /dev/null
+++ b/share/qtcreator/templates/wizards/autotest/tests.pro
@@ -0,0 +1,3 @@
+TEMPLATE = subdirs
+
+SUBDIRS += auto
diff --git a/share/qtcreator/templates/wizards/autotest/tmp.pro b/share/qtcreator/templates/wizards/autotest/tmp.pro
new file mode 100644
index 0000000000..1569bd45cb
--- /dev/null
+++ b/share/qtcreator/templates/wizards/autotest/tmp.pro
@@ -0,0 +1,12 @@
+TEMPLATE = subdirs
+
+@if "%BuildTests%" == "always"
+SUBDIRS += src \
+           tests
+@else
+SUBDIRS += src
+
+CONFIG(debug, debug|release) {
+    SUBDIRS += tests
+}
+@endif
diff --git a/share/qtcreator/templates/wizards/autotest/tst.pro b/share/qtcreator/templates/wizards/autotest/tst.pro
new file mode 100644
index 0000000000..8aa61b767e
--- /dev/null
+++ b/share/qtcreator/templates/wizards/autotest/tst.pro
@@ -0,0 +1,14 @@
+QT += testlib
+@if "%RequireGUI%" == "false"
+QT -= gui
+
+CONFIG += qt console warn_on depend_includepath testcase
+CONFIG -= app_bundle
+@else
+QT += gui
+CONFIG += qt warn_on depend_includepath testcase
+@endif
+
+TEMPLATE = app
+
+SOURCES += tst_%TestCaseName:l%.%CppSourceSuffix%
diff --git a/share/qtcreator/templates/wizards/autotest/tst_src.cpp b/share/qtcreator/templates/wizards/autotest/tst_src.cpp
new file mode 100644
index 0000000000..65d49e9c18
--- /dev/null
+++ b/share/qtcreator/templates/wizards/autotest/tst_src.cpp
@@ -0,0 +1,58 @@
+#include <QtTest>
+@if "%RequireApplication%" == "true"
+#include <QCoreApplication>
+@endif
+
+// add necessary includes here
+
+class %TestCaseName% : public QObject
+{
+ Q_OBJECT
+
+public:
+    %TestCaseName%();
+    ~%TestCaseName%();
+
+private slots:
+@if "%GenerateInitAndCleanup%" == "true"
+    void initTestCase();
+    void cleanupTestCase();
+@endif
+    void test_case1();
+
+};
+
+%TestCaseName%::%TestCaseName%()
+{
+
+}
+
+%TestCaseName%::~%TestCaseName%()
+{
+
+}
+
+@if "%GenerateInitAndCleanup%" == "true"
+void %TestCaseName%::initTestCase()
+{
+
+}
+
+void %TestCaseName%::cleanupTestCase()
+{
+
+}
+
+@endif
+void %TestCaseName%::test_case1()
+{
+
+}
+
+@if "%RequireApplication%" == "true"
+QTEST_MAIN(%TestCaseName%)
+@else
+QTEST_APPLESS_MAIN(%TestCaseName%)
+@endif
+
+#include "tst_%TestCaseName:l%.moc"
diff --git a/share/qtcreator/templates/wizards/autotest/wizard.xml b/share/qtcreator/templates/wizards/autotest/wizard.xml
new file mode 100644
index 0000000000..12f0c1e007
--- /dev/null
+++ b/share/qtcreator/templates/wizards/autotest/wizard.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://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 https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+****************************************************************************/
+-->
+<wizard version="1" kind="project"
+        class="qmakeproject" firstpage="10"
+        id="R.AutoTest" category="H.Project"
+        featuresRequired="QtSupport.Wizards.FeatureQt,QtSupport.Wizards.FeatureDesktop">
+        <!-- "Plugin.AutotestGenerator" as required feature would disable the template if the
+             plugin is disabled, but it fails on the kit selection page for having no valid kit -->
+    <icon>autotest_24.png</icon>
+    <description>Creates a new project including auto test skeleton.</description>
+    <displayname>Auto Test</displayname>;
+    <displaycategory>Other Project</displaycategory>
+    <files>
+        <file source="src.pro" target="src/src.pro" />
+        <file source="tests.pro" target="tests/tests.pro" />
+        <file source="auto.pro" target="tests/auto/auto.pro"/>
+        <file source="tst.pro" target="tests/auto/%TestCaseName:l%/%TestCaseName:l%.pro" />
+        <file source="tst_src.cpp"
+              target="tests/auto/%TestCaseName:l%/tst_%TestCaseName:l%.%CppSourceSuffix%"
+              openeditor="true"/>
+        <file source="main.cpp" target="src/main.%CppSourceSuffix%" openeditor="true" />
+        <file source="tmp.pro" target="%ProjectName:l%.pro" openproject="true" />
+    </files>
+    <!-- Create a 2nd wizard page with parameters -->
+    <fieldpagetitle>Project and Test Information</fieldpagetitle>
+    <fields>
+        <field name="RequireGUI">
+            <fieldcontrol class="QCheckBox" />
+            <fielddescription>GUI Application</fielddescription>
+        </field>
+        <field mandatory="true" name="TestCaseName">
+            <fieldcontrol class="QLineEdit" validator="^[a-zA-Z_0-9]+$"
+                          /><!-- defaulttext="" /> -->
+            <fielddescription>Test Case Name:</fielddescription>
+        </field>
+        <field name="RequireApplication">
+            <fieldcontrol class="QCheckBox" />
+            <fielddescription>Requires QApplication</fielddescription>
+        </field>
+        <field name="GenerateInitAndCleanup">
+            <fieldcontrol class="QCheckBox" />
+            <fielddescription>Generate initialization and cleanup code</fielddescription>
+        </field>
+        <field name="BuildAutoTests">
+            <fieldcontrol class="QComboBox" defaultindex="0" >
+                <comboentries>
+                    <comboentry value="always" >
+                        <comboentrytext>always</comboentrytext>
+                    </comboentry>
+                    <comboentry value="debug" >
+                        <comboentrytext>debug only</comboentrytext>
+                    </comboentry>
+                </comboentries>
+            </fieldcontrol>
+            <fielddescription>Build auto tests</fielddescription>
+        </field>
+    </fields>
+</wizard>
diff --git a/shared/qtcreator/templates/wizards/autotest/auto.pro b/shared/qtcreator/templates/wizards/autotest/auto.pro
deleted file mode 100644
index b39fef654c..0000000000
--- a/shared/qtcreator/templates/wizards/autotest/auto.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-TEMPLATE = subdirs
-
-SUBDIRS += %TestCaseName:l%
diff --git a/shared/qtcreator/templates/wizards/autotest/autotest_24.png b/shared/qtcreator/templates/wizards/autotest/autotest_24.png
deleted file mode 100644
index 3f52e9bf08..0000000000
Binary files a/shared/qtcreator/templates/wizards/autotest/autotest_24.png and /dev/null differ
diff --git a/shared/qtcreator/templates/wizards/autotest/main.cpp b/shared/qtcreator/templates/wizards/autotest/main.cpp
deleted file mode 100644
index 3ff500decd..0000000000
--- a/shared/qtcreator/templates/wizards/autotest/main.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-@if "%RequireGUI%" == "true"
-#include <QApplication>
-@else
-#include <QCoreApplication>
-@endif
-
-// add necessary includes here
-
-int main(int argc, char *argv[])
-{
-@if "%RequireGUI%" == "true"
-    QApplication a(argc, argv);
-@else
-    QCoreApplication a(argc, argv);
-@endif
-
-    return a.exec();
-}
diff --git a/shared/qtcreator/templates/wizards/autotest/src.pro b/shared/qtcreator/templates/wizards/autotest/src.pro
deleted file mode 100644
index 61fbe2a5bc..0000000000
--- a/shared/qtcreator/templates/wizards/autotest/src.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-@if "%RequireGUI%" == "true"
-QT += core gui
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
-@else
-QT -= gui
-CONFIG += console
-CONFIG -= app_bundle
-@endif
-
-TEMPLATE = app
-TARGET = %ProjectName%
-
-SOURCES += main.%CppSourceSuffix%
diff --git a/shared/qtcreator/templates/wizards/autotest/tests.pro b/shared/qtcreator/templates/wizards/autotest/tests.pro
deleted file mode 100644
index f927700008..0000000000
--- a/shared/qtcreator/templates/wizards/autotest/tests.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-TEMPLATE = subdirs
-
-SUBDIRS += auto
diff --git a/shared/qtcreator/templates/wizards/autotest/tmp.pro b/shared/qtcreator/templates/wizards/autotest/tmp.pro
deleted file mode 100644
index 1569bd45cb..0000000000
--- a/shared/qtcreator/templates/wizards/autotest/tmp.pro
+++ /dev/null
@@ -1,12 +0,0 @@
-TEMPLATE = subdirs
-
-@if "%BuildTests%" == "always"
-SUBDIRS += src \
-           tests
-@else
-SUBDIRS += src
-
-CONFIG(debug, debug|release) {
-    SUBDIRS += tests
-}
-@endif
diff --git a/shared/qtcreator/templates/wizards/autotest/tst.pro b/shared/qtcreator/templates/wizards/autotest/tst.pro
deleted file mode 100644
index 8aa61b767e..0000000000
--- a/shared/qtcreator/templates/wizards/autotest/tst.pro
+++ /dev/null
@@ -1,14 +0,0 @@
-QT += testlib
-@if "%RequireGUI%" == "false"
-QT -= gui
-
-CONFIG += qt console warn_on depend_includepath testcase
-CONFIG -= app_bundle
-@else
-QT += gui
-CONFIG += qt warn_on depend_includepath testcase
-@endif
-
-TEMPLATE = app
-
-SOURCES += tst_%TestCaseName:l%.%CppSourceSuffix%
diff --git a/shared/qtcreator/templates/wizards/autotest/tst_src.cpp b/shared/qtcreator/templates/wizards/autotest/tst_src.cpp
deleted file mode 100644
index 65d49e9c18..0000000000
--- a/shared/qtcreator/templates/wizards/autotest/tst_src.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-#include <QtTest>
-@if "%RequireApplication%" == "true"
-#include <QCoreApplication>
-@endif
-
-// add necessary includes here
-
-class %TestCaseName% : public QObject
-{
- Q_OBJECT
-
-public:
-    %TestCaseName%();
-    ~%TestCaseName%();
-
-private slots:
-@if "%GenerateInitAndCleanup%" == "true"
-    void initTestCase();
-    void cleanupTestCase();
-@endif
-    void test_case1();
-
-};
-
-%TestCaseName%::%TestCaseName%()
-{
-
-}
-
-%TestCaseName%::~%TestCaseName%()
-{
-
-}
-
-@if "%GenerateInitAndCleanup%" == "true"
-void %TestCaseName%::initTestCase()
-{
-
-}
-
-void %TestCaseName%::cleanupTestCase()
-{
-
-}
-
-@endif
-void %TestCaseName%::test_case1()
-{
-
-}
-
-@if "%RequireApplication%" == "true"
-QTEST_MAIN(%TestCaseName%)
-@else
-QTEST_APPLESS_MAIN(%TestCaseName%)
-@endif
-
-#include "tst_%TestCaseName:l%.moc"
diff --git a/shared/qtcreator/templates/wizards/autotest/wizard.xml b/shared/qtcreator/templates/wizards/autotest/wizard.xml
deleted file mode 100644
index 12f0c1e007..0000000000
--- a/shared/qtcreator/templates/wizards/autotest/wizard.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://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 https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-****************************************************************************/
--->
-<wizard version="1" kind="project"
-        class="qmakeproject" firstpage="10"
-        id="R.AutoTest" category="H.Project"
-        featuresRequired="QtSupport.Wizards.FeatureQt,QtSupport.Wizards.FeatureDesktop">
-        <!-- "Plugin.AutotestGenerator" as required feature would disable the template if the
-             plugin is disabled, but it fails on the kit selection page for having no valid kit -->
-    <icon>autotest_24.png</icon>
-    <description>Creates a new project including auto test skeleton.</description>
-    <displayname>Auto Test</displayname>;
-    <displaycategory>Other Project</displaycategory>
-    <files>
-        <file source="src.pro" target="src/src.pro" />
-        <file source="tests.pro" target="tests/tests.pro" />
-        <file source="auto.pro" target="tests/auto/auto.pro"/>
-        <file source="tst.pro" target="tests/auto/%TestCaseName:l%/%TestCaseName:l%.pro" />
-        <file source="tst_src.cpp"
-              target="tests/auto/%TestCaseName:l%/tst_%TestCaseName:l%.%CppSourceSuffix%"
-              openeditor="true"/>
-        <file source="main.cpp" target="src/main.%CppSourceSuffix%" openeditor="true" />
-        <file source="tmp.pro" target="%ProjectName:l%.pro" openproject="true" />
-    </files>
-    <!-- Create a 2nd wizard page with parameters -->
-    <fieldpagetitle>Project and Test Information</fieldpagetitle>
-    <fields>
-        <field name="RequireGUI">
-            <fieldcontrol class="QCheckBox" />
-            <fielddescription>GUI Application</fielddescription>
-        </field>
-        <field mandatory="true" name="TestCaseName">
-            <fieldcontrol class="QLineEdit" validator="^[a-zA-Z_0-9]+$"
-                          /><!-- defaulttext="" /> -->
-            <fielddescription>Test Case Name:</fielddescription>
-        </field>
-        <field name="RequireApplication">
-            <fieldcontrol class="QCheckBox" />
-            <fielddescription>Requires QApplication</fielddescription>
-        </field>
-        <field name="GenerateInitAndCleanup">
-            <fieldcontrol class="QCheckBox" />
-            <fielddescription>Generate initialization and cleanup code</fielddescription>
-        </field>
-        <field name="BuildAutoTests">
-            <fieldcontrol class="QComboBox" defaultindex="0" >
-                <comboentries>
-                    <comboentry value="always" >
-                        <comboentrytext>always</comboentrytext>
-                    </comboentry>
-                    <comboentry value="debug" >
-                        <comboentrytext>debug only</comboentrytext>
-                    </comboentry>
-                </comboentries>
-            </fieldcontrol>
-            <fielddescription>Build auto tests</fielddescription>
-        </field>
-    </fields>
-</wizard>
-- 
cgit v1.2.1