From 8b9c0d28fe084e8c7912a55f29052052edcfdd6e Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Wed, 17 Jun 2015 15:33:10 +0900
Subject: Revert to .kdevelop files with <kdevelop> entity name for project
 files. This resolves bug 2308.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit e044c5463329652f28565dfc7de24ef8b0edaa6f)
---
 .../cpp/app_templates/qmakesimple/CMakeLists.txt   |   2 +-
 .../cpp/app_templates/qmakesimple/Makefile.am      |   2 +-
 .../cpp/app_templates/qmakesimple/app.kdevelop     | 100 +++++++++++++++++++++
 .../cpp/app_templates/qmakesimple/app.tdevelop     | 100 ---------------------
 .../qmakesimple/qmakesimple.kdevtemplate           |   4 +-
 5 files changed, 104 insertions(+), 104 deletions(-)
 create mode 100644 languages/cpp/app_templates/qmakesimple/app.kdevelop
 delete mode 100644 languages/cpp/app_templates/qmakesimple/app.tdevelop

(limited to 'languages/cpp/app_templates/qmakesimple')

diff --git a/languages/cpp/app_templates/qmakesimple/CMakeLists.txt b/languages/cpp/app_templates/qmakesimple/CMakeLists.txt
index 64b3b0bd..3693890b 100644
--- a/languages/cpp/app_templates/qmakesimple/CMakeLists.txt
+++ b/languages/cpp/app_templates/qmakesimple/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( qmakesimple.tar.gz ALL
   COMMAND tar zcf qmakesimple.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    main.cpp qmakesimple.png app.tdevelop app.pro src.pro
+    main.cpp qmakesimple.png app.kdevelop app.pro src.pro
 )
 
 
diff --git a/languages/cpp/app_templates/qmakesimple/Makefile.am b/languages/cpp/app_templates/qmakesimple/Makefile.am
index ac17219f..a187172f 100644
--- a/languages/cpp/app_templates/qmakesimple/Makefile.am
+++ b/languages/cpp/app_templates/qmakesimple/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = main.cpp qmakesimple.png app.tdevelop app.pro src.pro
+dataFiles = main.cpp qmakesimple.png app.kdevelop app.pro src.pro
 templateName = qmakesimple
 
 ### no need to change below:
diff --git a/languages/cpp/app_templates/qmakesimple/app.kdevelop b/languages/cpp/app_templates/qmakesimple/app.kdevelop
new file mode 100644
index 00000000..31180af7
--- /dev/null
+++ b/languages/cpp/app_templates/qmakesimple/app.kdevelop
@@ -0,0 +1,100 @@
+<?xml version="1.0"?>
+<kdevelop>
+ <general>
+  <author>%{AUTHOR}</author>
+  <email>%{EMAIL}</email>
+  <version>%{VERSION}</version>
+  <projectmanagement>KDevTrollProject</projectmanagement>
+  <primarylanguage>C++</primarylanguage>
+  <keywords>
+   <keyword>Qt</keyword>
+  </keywords>
+ </general>
+ <kdevfileview>
+  <groups>
+   <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
+   <group pattern="*.ui" name="User Interface" />
+   <group pattern="*.png" name="Icons" />
+   <group pattern="*" name="Others" />
+  </groups>
+ </kdevfileview>
+ <kdevcppsupport>
+   <qt>
+     <version>3</version>
+     <used>true</used>
+     <includestyle>3</includestyle>
+     <designerintegration>EmbeddedKDevDesigner</designerintegration>
+      <root>%{QTDIR}</root>
+      <qmake>%{QMAKE}</qmake>
+   </qt>
+ </kdevcppsupport>
+ <kdevdoctreeview>
+    <ignoretocs>
+      <toc>ada</toc>
+      <toc>ada_bugs_gcc</toc>
+      <toc>bash</toc>
+      <toc>bash_bugs</toc>
+      <toc>clanlib</toc>
+      <toc>w3c-dom-level2-html</toc>
+      <toc>fortran_bugs_gcc</toc>
+      <toc>gnome1</toc>
+      <toc>gnustep</toc>
+      <toc>gtk</toc>
+      <toc>gtk_bugs</toc>
+      <toc>haskell</toc>
+      <toc>haskell_bugs_ghc</toc>
+      <toc>java_bugs_gcc</toc>
+      <toc>java_bugs_sun</toc>
+      <toc>kde2book</toc>
+      <toc>opengl</toc>
+      <toc>pascal_bugs_fp</toc>
+      <toc>php</toc>
+      <toc>php_bugs</toc>
+      <toc>perl</toc>
+      <toc>perl_bugs</toc>
+      <toc>python</toc>
+      <toc>python_bugs</toc>
+      <toc>ruby</toc>
+      <toc>ruby_bugs</toc>
+      <toc>sdl</toc>
+      <toc>stl</toc>
+      <toc>w3c-svg</toc>
+      <toc>sw</toc>
+      <toc>w3c-uaag10</toc>
+      <toc>wxwidgets_bugs</toc>
+    </ignoretocs>
+    <ignoredoxygen>
+      <toc>TDE Libraries (Doxygen)</toc>
+    </ignoredoxygen>
+ </kdevdoctreeview>
+ <kdevdebugger>
+  <general>
+   <programargs></programargs>
+   <gdbpath>/usr/bin/gdb</gdbpath>
+   <breakonloadinglibs>true</breakonloadinglibs>
+   <separatetty>false</separatetty>
+   <floatingtoolbar>false</floatingtoolbar>  
+   <dbgshell/>
+  </general>
+ </kdevdebugger>
+ <kdevtrollproject>
+   <run>
+    <mainprogram>./bin/%{APPNAMELC}</mainprogram>
+    <programargs/>
+   </run>
+  </kdevtrollproject>
+  <kdevfilecreate>
+    <useglobaltypes>
+      <type ext="ui" />
+      <type ext="cpp" />
+      <type ext="h" />
+      <type ext="ts" />
+    </useglobaltypes>
+  </kdevfilecreate>
+  <kdevdocumentation>
+    <projectdoc>
+      <docsystem>Doxygen Documentation Collection</docsystem>
+      <docurl>%{APPNAMELC}.tag</docurl>
+    </projectdoc>
+  </kdevdocumentation>
+</kdevelop>
diff --git a/languages/cpp/app_templates/qmakesimple/app.tdevelop b/languages/cpp/app_templates/qmakesimple/app.tdevelop
deleted file mode 100644
index 2af4f7ad..00000000
--- a/languages/cpp/app_templates/qmakesimple/app.tdevelop
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0"?>
-<tdevelop>
- <general>
-  <author>%{AUTHOR}</author>
-  <email>%{EMAIL}</email>
-  <version>%{VERSION}</version>
-  <projectmanagement>KDevTrollProject</projectmanagement>
-  <primarylanguage>C++</primarylanguage>
-  <keywords>
-   <keyword>Qt</keyword>
-  </keywords>
- </general>
- <kdevfileview>
-  <groups>
-   <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
-   <group pattern="*.ui" name="User Interface" />
-   <group pattern="*.png" name="Icons" />
-   <group pattern="*" name="Others" />
-  </groups>
- </kdevfileview>
- <kdevcppsupport>
-   <qt>
-     <version>3</version>
-     <used>true</used>
-     <includestyle>3</includestyle>
-     <designerintegration>EmbeddedKDevDesigner</designerintegration>
-      <root>%{QTDIR}</root>
-      <qmake>%{QMAKE}</qmake>
-   </qt>
- </kdevcppsupport>
- <kdevdoctreeview>
-    <ignoretocs>
-      <toc>ada</toc>
-      <toc>ada_bugs_gcc</toc>
-      <toc>bash</toc>
-      <toc>bash_bugs</toc>
-      <toc>clanlib</toc>
-      <toc>w3c-dom-level2-html</toc>
-      <toc>fortran_bugs_gcc</toc>
-      <toc>gnome1</toc>
-      <toc>gnustep</toc>
-      <toc>gtk</toc>
-      <toc>gtk_bugs</toc>
-      <toc>haskell</toc>
-      <toc>haskell_bugs_ghc</toc>
-      <toc>java_bugs_gcc</toc>
-      <toc>java_bugs_sun</toc>
-      <toc>kde2book</toc>
-      <toc>opengl</toc>
-      <toc>pascal_bugs_fp</toc>
-      <toc>php</toc>
-      <toc>php_bugs</toc>
-      <toc>perl</toc>
-      <toc>perl_bugs</toc>
-      <toc>python</toc>
-      <toc>python_bugs</toc>
-      <toc>ruby</toc>
-      <toc>ruby_bugs</toc>
-      <toc>sdl</toc>
-      <toc>stl</toc>
-      <toc>w3c-svg</toc>
-      <toc>sw</toc>
-      <toc>w3c-uaag10</toc>
-      <toc>wxwidgets_bugs</toc>
-    </ignoretocs>
-    <ignoredoxygen>
-      <toc>TDE Libraries (Doxygen)</toc>
-    </ignoredoxygen>
- </kdevdoctreeview>
- <kdevdebugger>
-  <general>
-   <programargs></programargs>
-   <gdbpath>/usr/bin/gdb</gdbpath>
-   <breakonloadinglibs>true</breakonloadinglibs>
-   <separatetty>false</separatetty>
-   <floatingtoolbar>false</floatingtoolbar>  
-   <dbgshell/>
-  </general>
- </kdevdebugger>
- <kdevtrollproject>
-   <run>
-    <mainprogram>./bin/%{APPNAMELC}</mainprogram>
-    <programargs/>
-   </run>
-  </kdevtrollproject>
-  <kdevfilecreate>
-    <useglobaltypes>
-      <type ext="ui" />
-      <type ext="cpp" />
-      <type ext="h" />
-      <type ext="ts" />
-    </useglobaltypes>
-  </kdevfilecreate>
-  <kdevdocumentation>
-    <projectdoc>
-      <docsystem>Doxygen Documentation Collection</docsystem>
-      <docurl>%{APPNAMELC}.tag</docurl>
-    </projectdoc>
-  </kdevdocumentation>
-</tdevelop>
diff --git a/languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate b/languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate
index 8f2dbee7..d9d03936 100644
--- a/languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate
+++ b/languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate
@@ -54,8 +54,8 @@ Archive=qmakesimple.tar.gz
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE2]
 Type=install
-- 
cgit v1.2.3