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