19aa0bf
diff -ur kdevelop-3.5.2/languages/cpp/app_templates/kde4app/kde4app.kdevelop kdevelop-3.5.2-kde4template/languages/cpp/app_templates/kde4app/kde4app.kdevelop
19aa0bf
--- kdevelop-3.5.2/languages/cpp/app_templates/kde4app/kde4app.kdevelop	2007-09-26 11:42:09.000000000 +0200
19aa0bf
+++ kdevelop-3.5.2-kde4template/languages/cpp/app_templates/kde4app/kde4app.kdevelop	2008-06-07 01:10:11.000000000 +0200
19aa0bf
@@ -113,18 +113,11 @@
19aa0bf
   </cppsupportpart>
19aa0bf
   <kdevcustomproject>
19aa0bf
     <run>
19aa0bf
-      <mainprogram>%{dest}/build/%{APPNAMELC}</mainprogram>
19aa0bf
+      <mainprogram>%{dest}/%{APPNAMELC}</mainprogram>
19aa0bf
       <programargs/>
19aa0bf
       <terminal>false</terminal>
19aa0bf
-      <autocompile>false</autocompile>
19aa0bf
-      <envvars>
19aa0bf
-        <envvar value="" name="KDEDIRS" />
19aa0bf
-        <envvar value="" name="KDEHOME" />
19aa0bf
-        <envvar value="" name="LD_LIBRARY_PATH" />
19aa0bf
-        <envvar value="" name="PATH" />
19aa0bf
-        <envvar value="" name="PKG_CONFIG_PATH" />
19aa0bf
-        <envvar value="" name="QT_PLUGIN_PATH" />
19aa0bf
-      </envvars>
19aa0bf
+      <autocompile>true</autocompile>
19aa0bf
+      <envvars/>
19aa0bf
       <autoinstall>false</autoinstall>
19aa0bf
       <autokdesu>false</autokdesu>
19aa0bf
       <globaldebugarguments/>
19aa0bf
@@ -134,7 +127,7 @@
19aa0bf
     </run>
19aa0bf
     <build>
19aa0bf
       <buildtool>make</buildtool>
19aa0bf
-      <builddir>%{dest}/build</builddir>
19aa0bf
+      <builddir>%{dest}</builddir>
19aa0bf
     </build>
19aa0bf
     <make>
19aa0bf
       <abortonerror>false</abortonerror>
19aa0bf
@@ -146,14 +139,7 @@
19aa0bf
       <makeoptions/>
19aa0bf
       <selectedenvironment>default</selectedenvironment>
19aa0bf
       <environments>
19aa0bf
-        <default>
19aa0bf
-          <envvar value="" name="KDEDIRS" />
19aa0bf
-          <envvar value="" name="KDEHOME" />
19aa0bf
-          <envvar value="" name="LD_LIBRARY_PATH" />
19aa0bf
-          <envvar value="" name="PATH" />
19aa0bf
-          <envvar value="" name="PKG_CONFIG_PATH" />
19aa0bf
-          <envvar value="" name="QT_PLUGIN_PATH" />
19aa0bf
-        </default>
19aa0bf
+        <default/>
19aa0bf
       </environments>
19aa0bf
     </make>
19aa0bf
     <filetypes>
19aa0bf
@@ -179,7 +165,10 @@
19aa0bf
       </environments>
19aa0bf
     </other>
19aa0bf
     <blacklist>
19aa0bf
-        <path>build</path>
19aa0bf
+        <path>CMakeFiles</path>
19aa0bf
+        <path>CMakeTmp</path>
19aa0bf
+        <path>cmake_install.cmake</path>
19aa0bf
+        <path>cmake_uninstall.cmake</path>
19aa0bf
     </blacklist>
19aa0bf
   </kdevcustomproject>
19aa0bf
   <kdevcppsupport>
19aa0bf
@@ -189,7 +178,6 @@
19aa0bf
       <includestyle>4</includestyle>
19aa0bf
       <designerintegration>ExternalDesigner</designerintegration>
19aa0bf
       <designer>/usr/bin/designer-qt4</designer>
19aa0bf
-      <root>/usr/lib/qt4</root>
19aa0bf
     </qt>
19aa0bf
   </kdevcppsupport>
19aa0bf
   <kdevclassview>
73d4e7c
diff -ur kdevelop-3.5.2/languages/cpp/app_templates/kde4app/kde4app.kdevtemplate kdevelop-3.5.2-kde4template/languages/cpp/app_templates/kde4app/kde4app.kdevtemplate
73d4e7c
--- kdevelop-3.5.2/languages/cpp/app_templates/kde4app/kde4app.kdevtemplate	2008-02-11 12:22:37.000000000 +0100
19aa0bf
+++ kdevelop-3.5.2-kde4template/languages/cpp/app_templates/kde4app/kde4app.kdevtemplate	2008-06-07 01:08:10.000000000 +0200
73d4e7c
@@ -43,7 +43,7 @@
73d4e7c
 Comment[sv]=Skapar ett enkelt KDE 4-program med ett toppnivåfönster, menyer och verktygsrader.
73d4e7c
 Comment[zh_TW]=產生一個簡單的 KDE4 應用程式,內含頂層視窗、選單與工具列。
73d4e7c
 FileTemplates=h,CStyle,cpp,CStyle
73d4e7c
-ShowFilesAfterGeneration=%{dest}/README
73d4e7c
+ShowFilesAfterGeneration=%{dest}/%{APPNAMELC}.cpp
73d4e7c
 Archive=kde4app.tar.gz
73d4e7c
 
73d4e7c
 [FILE1]
19aa0bf
@@ -112,24 +112,22 @@
73d4e7c
 Source=%{src}/settings.kcfgc
73d4e7c
 Dest=%{dest}/settings.kcfgc
73d4e7c
 
73d4e7c
-[FILE13]
73d4e7c
-Type=install
73d4e7c
-Source=%{src}/README
73d4e7c
-Dest=%{dest}/README
19aa0bf
 
73d4e7c
-[FILE14]
19aa0bf
+[FILE13]
19aa0bf
 Type=install
19aa0bf
 Source=%{src}/kde4app.kdevelop
19aa0bf
 Dest=%{dest}/%{APPNAMELC}.kdevelop
19aa0bf
 
73d4e7c
-[FILE15]
19aa0bf
+[FILE14]
19aa0bf
 Type=install
19aa0bf
 Source=%{src}/kde4app.kdevelop.filelist
19aa0bf
 Dest=%{dest}/%{APPNAMELC}.kdevelop.filelist
73d4e7c
 
19aa0bf
-[MKDIR1]
19aa0bf
-Type=mkdir
19aa0bf
-Dir=%{dest}/build
73d4e7c
+[CMAKE]
73d4e7c
+Type=finishcmd
73d4e7c
+Command=cmake ./ -GKDevelop3
73d4e7c
+Directory=%{dest}
73d4e7c
+
19aa0bf
 
73d4e7c
 [MSG]
73d4e7c
 Type=message
73d4e7c
diff -ur kdevelop-3.5.2/languages/cpp/app_templates/kde4app/Makefile.am kdevelop-3.5.2-kde4template/languages/cpp/app_templates/kde4app/Makefile.am
73d4e7c
--- kdevelop-3.5.2/languages/cpp/app_templates/kde4app/Makefile.am	2007-09-26 11:42:09.000000000 +0200
19aa0bf
+++ kdevelop-3.5.2-kde4template/languages/cpp/app_templates/kde4app/Makefile.am	2008-06-07 00:37:23.000000000 +0200
73d4e7c
@@ -1,6 +1,6 @@
73d4e7c
 dataFiles = kapp4.cpp kapp4.h prefs_base.ui kapp4view.cpp kapp4view.h kapp4view_base.ui \
73d4e7c
 	main.cpp kde4appui.rc CMakeLists.txt kapp4.desktop kapp4.kcfg settings.kcfgc \
73d4e7c
-	kde4app.png README kde4app.kdevelop kde4app.kdevelop.filelist
19aa0bf
+	kde4app.png kde4app.kdevelop kde4app.kdevelop.filelist
73d4e7c
 
73d4e7c
 templateName = kde4app
73d4e7c
 
73d4e7c
diff -ur kdevelop-3.5.2/languages/cpp/app_templates/kde4app/Makefile.in kdevelop-3.5.2-kde4template/languages/cpp/app_templates/kde4app/Makefile.in
73d4e7c
--- kdevelop-3.5.2/languages/cpp/app_templates/kde4app/Makefile.in	2008-05-13 16:23:40.000000000 +0200
19aa0bf
+++ kdevelop-3.5.2-kde4template/languages/cpp/app_templates/kde4app/Makefile.in	2008-06-07 00:37:30.000000000 +0200
73d4e7c
@@ -373,7 +373,7 @@
73d4e7c
 xdg_menudir = @xdg_menudir@
73d4e7c
 dataFiles = kapp4.cpp kapp4.h prefs_base.ui kapp4view.cpp kapp4view.h kapp4view_base.ui \
73d4e7c
 	main.cpp kde4appui.rc CMakeLists.txt kapp4.desktop kapp4.kcfg settings.kcfgc \
73d4e7c
-	kde4app.png README kde4app.kdevelop kde4app.kdevelop.filelist
19aa0bf
+	kde4app.png kde4app.kdevelop kde4app.kdevelop.filelist
73d4e7c
 
73d4e7c
 templateName = kde4app
73d4e7c
 
73d4e7c
diff -ur kdevelop-3.5.2/languages/cpp/app_templates/kdecpp.appwizard kdevelop-3.5.2-kde4template/languages/cpp/app_templates/kdecpp.appwizard
73d4e7c
--- kdevelop-3.5.2/languages/cpp/app_templates/kdecpp.appwizard	2007-04-10 01:44:25.000000000 +0200
73d4e7c
+++ kdevelop-3.5.2-kde4template/languages/cpp/app_templates/kdecpp.appwizard	2008-06-06 23:52:16.000000000 +0200
73d4e7c
@@ -1,2 +1,2 @@
73d4e7c
 [General]
73d4e7c
-List=kdedcop,kioslave,kxt,kdevlang,kmake,kapp,kconfig35,kdevlang,kdevpart,kateplugin,kdevpart2,kopart,noatunui,kateplugin2,kfileplugin,konqnavpanel,noatunvisual,dcopservice,khello,kpartapp,khello2,kpartplugin,kcmodule,kicker,kscreensaver,kscons_kxt,kscons_kmdi
73d4e7c
+List=kde4app,kdedcop,kioslave,kxt,kdevlang,kmake,kapp,kconfig35,kdevlang,kdevpart,kateplugin,kdevpart2,kopart,noatunui,kateplugin2,kfileplugin,konqnavpanel,noatunvisual,dcopservice,khello,kpartapp,khello2,kpartplugin,kcmodule,kicker,kscreensaver,kscons_kxt,kscons_kmdi