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