Fixed tqt3 folder in API documentation generation.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e028916..f43dcb7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,7 +52,7 @@
 ##### add apidox targets ############
 
 add_custom_target(apidox
-  COMMAND "./generate_apidox" "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" "${HTML_INSTALL_DIR}" "/usr/share/qt3/doc/html"
+  COMMAND "./generate_apidox" "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" "${HTML_INSTALL_DIR}" "/usr/share/tqt3/doc/html"
   WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/cmake/")
 
 add_custom_target(install-apidox

Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs

diff --git a/pics/crystalsvg/index.theme b/pics/crystalsvg/index.theme
index 805d2f7..c93118b 100644
--- a/pics/crystalsvg/index.theme
+++ b/pics/crystalsvg/index.theme
@@ -115,7 +115,7 @@
 SmallSizes=16
 PanelDefault=32
 PanelSizes=16,22,32,48,64,128
-Directories=16x16/actions,16x16/apps,16x16/devices,16x16/places,16x16/mimetypes,22x22/actions,22x22/apps,22x22/devices,22x22/places,22x22/mimetypes,32x32/actions,32x32/apps,32x32/devices,32x32/places,32x32/mimetypes,48x48/actions,48x48/apps,48x48/devices,48x48/places,48x48/mimetypes,64x64/actions,64x64/apps,64x64/devices,64x64/places,64x64/mimetypes,128x128/actions,128x128/apps,128x128/devices,128x128/places,128x128/mimetypes
+Directories=16x16/actions,16x16/apps,16x16/categories,16x16/devices,16x16/places,16x16/mimetypes,22x22/actions,22x22/apps,22x22/categories,22x22/devices,22x22/places,22x22/mimetypes,32x32/actions,32x32/apps,32x32/categories,32x32/devices,32x32/places,32x32/mimetypes,48x48/actions,48x48/apps,48x48/categories,48x48/devices,48x48/places,48x48/mimetypes,64x64/actions,64x64/apps,64x64/categories,64x64/devices,64x64/places,64x64/mimetypes,128x128/actions,128x128/apps,128x128/categories,128x128/devices,128x128/places,128x128/mimetypes
 [16x16/actions]
 Size=16
 Context=Actions
@@ -123,6 +123,10 @@
 [16x16/apps]
 Size=16
 Context=Applications
+Type=Threshold
+[16x16/categories]
+Size=16
+Context=Categories
 Type=Threshold
 [16x16/devices]
 Size=16
@@ -144,6 +148,10 @@
 Size=22
 Context=Applications
 Type=Threshold
+[22x22/categories]
+Size=22
+Context=Categories
+Type=Threshold
 [22x22/devices]
 Size=22
 Context=Devices
@@ -163,6 +171,10 @@
 [32x32/apps]
 Size=32
 Context=Applications
+Type=Threshold
+[32x32/categories]
+Size=32
+Context=Categories
 Type=Threshold
 [32x32/devices]
 Size=32
@@ -184,6 +196,10 @@
 Size=48
 Context=Applications
 Type=Threshold
+[48x48/categories]
+Size=48
+Context=Categories
+Type=Threshold
 [48x48/devices]
 Size=48
 Context=Devices
@@ -204,6 +220,10 @@
 Size=64
 Context=Applications
 Type=Threshold
+[64x64/categories]
+Size=64
+Context=Categories
+Type=Threshold
 [64x64/devices]
 Size=64
 Context=Devices
@@ -224,6 +244,10 @@
 Size=128
 Context=Applications
 Type=Threshold
+[128x128/categories]
+Size=128
+Context=Categories
+Type=Threshold
 [128x128/devices]
 Size=128
 Context=Devices
diff --git a/tdecore/kiconloader.cpp b/tdecore/kiconloader.cpp
index 0f13f7c..4d787c3 100644
--- a/tdecore/kiconloader.cpp
+++ b/tdecore/kiconloader.cpp
@@ -490,7 +490,7 @@
 	for (int i = 0 ; i < count ; i++)
 	{
 	    icon = themeNode->theme->iconPath(name + *ext[i], size, TDEIcon::MatchBest);
-	    if (icon.isValid()) goto icon_found;	
+	    if (icon.isValid()) goto icon_found;
 	}
     }
     icon_found:
diff --git a/tdeioslave/file/file.protocol b/tdeioslave/file/file.protocol
index ef3be0d..c2a12f0 100644
--- a/tdeioslave/file/file.protocol
+++ b/tdeioslave/file/file.protocol
@@ -13,4 +13,4 @@
 maxInstances=4
 DocPath=tdeioslave/file/index.html
 Class=:local
-Icon=filenew
+Icon=document-new
diff --git a/tderesources/tderesources.desktop b/tderesources/tderesources.desktop
index dddc4c8..ab4d942 100644
--- a/tderesources/tderesources.desktop
+++ b/tderesources/tderesources.desktop
@@ -150,7 +150,7 @@
 Comment[zh_CN]=������ TDE ������
 Comment[zh_HK]=������ TDE ���������������
 Comment[zh_TW]=������������ TDE ���������
-Keywords=resources;konnector resource;contact resource;calendar resource;notes resource;imap
+Keywords=resources;konnector resource;contact resource;calendar resource;notes resource;imap;
 Keywords[af]=hulpbronne;konnector hulpbron;kontak hulpbron;kalender hulpbron; notas hulpbron; imap
 Keywords[be]=��������������;����������������;����������������;��������������;resources;konnector resource;contact resource;calendar resource;notes resource;imap
 Keywords[bg]=������������; ��������������; ������������������; ��������������; ��������������; ����������������; ����������; ����������������; resources; konnector resource; contact resource; calendar resource; notes resource; imap