Copy the KDE 3.5 branch to branches/trinity for new KDE 3.5 features.

BUG:215923


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1054174 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 files changed, 10 insertions, 0 deletions

diff --git a/kpilot/conduits/docconduit/Icons/CMakeLists.txt b/kpilot/conduits/docconduit/Icons/CMakeLists.txt
new file mode 100644
index 00000000..3d1034d4
--- /dev/null
+++ b/kpilot/conduits/docconduit/Icons/CMakeLists.txt
@@ -0,0 +1,3 @@
+
+kde3_install_icons_custom( hicolor )
+
diff --git a/kpilot/conduits/docconduit/Icons/Makefile.am b/kpilot/conduits/docconduit/Icons/Makefile.am
new file mode 100644
index 00000000..f371f4ae
--- /dev/null
+++ b/kpilot/conduits/docconduit/Icons/Makefile.am
@@ -0,0 +1,7 @@
+METASOURCES = AUTO
+
+kpalmdocicondir = $(kde_datadir)/kpilot/icons
+kpalmdocicon_ICON = kpalmdoc
+
+KDE_ICON = kpalmdoc
+
diff --git a/kpilot/conduits/docconduit/Icons/cr16-app-kpalmdoc.png b/kpilot/conduits/docconduit/Icons/cr16-app-kpalmdoc.png
new file mode 100644
index 00000000..0f5fb75d
--- /dev/null
+++ b/kpilot/conduits/docconduit/Icons/cr16-app-kpalmdoc.png
diff --git a/kpilot/conduits/docconduit/Icons/cr22-app-kpalmdoc.png b/kpilot/conduits/docconduit/Icons/cr22-app-kpalmdoc.png
new file mode 100644
index 00000000..d93aa4ba
--- /dev/null
+++ b/kpilot/conduits/docconduit/Icons/cr22-app-kpalmdoc.png
diff --git a/kpilot/conduits/docconduit/Icons/cr32-app-kpalmdoc.png b/kpilot/conduits/docconduit/Icons/cr32-app-kpalmdoc.png
new file mode 100644
index 00000000..09a7020b
--- /dev/null
+++ b/kpilot/conduits/docconduit/Icons/cr32-app-kpalmdoc.png
diff --git a/kpilot/conduits/docconduit/Icons/cr48-app-kpalmdoc.png b/kpilot/conduits/docconduit/Icons/cr48-app-kpalmdoc.png
new file mode 100644
index 00000000..41cb3b9b
--- /dev/null
+++ b/kpilot/conduits/docconduit/Icons/cr48-app-kpalmdoc.png