Git commit 27da7b494ce425ba8d07a5696d60949592132c10 by Kevin Ottens. Committed on 06/11/2013 at 20:53. Pushed by ervin into branch 'frameworks'.
Move to KIO the docs which belong to it M +0 -2 doc/CMakeLists.txt M +2 -0 staging/kio/CMakeLists.txt A +2 -0 staging/kio/docs/CMakeLists.txt R +0 -0 staging/kio/docs/design.txt [from: staging/kio/doc/design.txt - 100% similarity] R +0 -0 staging/kio/docs/kcookiejar4/CMakeLists.txt [from: doc/kcookiejar4/CMakeLists.txt - 100% similarity] R +0 -0 staging/kio/docs/kcookiejar4/man-kcookiejar4.8.docbook [from: doc/kcookiejar4/man-kcookiejar4.8.docbook - 100% similarity] R +0 -0 staging/kio/docs/kioslave/CMakeLists.txt [from: doc/kioslave/CMakeLists.txt - 100% similarity] R +0 -0 staging/kio/docs/kioslave/data/CMakeLists.txt [from: doc/kioslave/data/CMakeLists.txt - 100% similarity] R +0 -0 staging/kio/docs/kioslave/data/index.docbook [from: doc/kioslave/data/index.docbook - 100% similarity] R +0 -0 staging/kio/docs/kioslave/file/CMakeLists.txt [from: doc/kioslave/file/CMakeLists.txt - 100% similarity] R +0 -0 staging/kio/docs/kioslave/file/index.docbook [from: doc/kioslave/file/index.docbook - 100% similarity] R +0 -0 staging/kio/docs/kioslave/ftp/CMakeLists.txt [from: doc/kioslave/ftp/CMakeLists.txt - 100% similarity] R +0 -0 staging/kio/docs/kioslave/ftp/index.docbook [from: doc/kioslave/ftp/index.docbook - 100% similarity] R +0 -0 staging/kio/docs/kioslave/help/CMakeLists.txt [from: doc/kioslave/help/CMakeLists.txt - 100% similarity] R +0 -0 staging/kio/docs/kioslave/help/index.docbook [from: doc/kioslave/help/index.docbook - 100% similarity] R +0 -0 staging/kio/docs/kioslave/http/CMakeLists.txt [from: doc/kioslave/http/CMakeLists.txt - 100% similarity] R +0 -0 staging/kio/docs/kioslave/http/index.docbook [from: doc/kioslave/http/index.docbook - 100% similarity] R +0 -0 staging/kio/docs/kioslave/mailto/CMakeLists.txt [from: doc/kioslave/mailto/CMakeLists.txt - 100% similarity] R +0 -0 staging/kio/docs/kioslave/mailto/index.docbook [from: doc/kioslave/mailto/index.docbook - 100% similarity] R +0 -0 staging/kio/docs/kioslave/rlogin/CMakeLists.txt [from: doc/kioslave/rlogin/CMakeLists.txt - 100% similarity] R +0 -0 staging/kio/docs/kioslave/rlogin/index.docbook [from: doc/kioslave/rlogin/index.docbook - 100% similarity] R +0 -0 staging/kio/docs/kioslave/telnet/CMakeLists.txt [from: doc/kioslave/telnet/CMakeLists.txt - 100% similarity] R +0 -0 staging/kio/docs/kioslave/telnet/index.docbook [from: doc/kioslave/telnet/index.docbook - 100% similarity] R +0 -0 staging/kio/docs/kioslave/webdav/CMakeLists.txt [from: doc/kioslave/webdav/CMakeLists.txt - 100% similarity] R +0 -0 staging/kio/docs/kioslave/webdav/index.docbook [from: doc/kioslave/webdav/index.docbook - 100% similarity] R +0 -0 staging/kio/docs/krun-passing-slaves.txt [from: staging/kio/doc/krun-passing-slaves.txt - 100% similarity] R +0 -0 staging/kio/docs/metadata.txt [from: staging/kio/doc/metadata.txt - 100% similarity] http://commits.kde.org/kdelibs/27da7b494ce425ba8d07a5696d60949592132c10 diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index c365d67..6f2d19a 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -1,9 +1,7 @@ add_subdirectory( common ) -add_subdirectory( kioslave ) if (NOT WIN32) - add_subdirectory( kcookiejar4 ) add_subdirectory( makekdewidgets ) add_subdirectory( sonnet ) add_subdirectory( kde4support ) diff --git a/staging/kio/CMakeLists.txt b/staging/kio/CMakeLists.txt index 9ec57d8..6c7297e 100644 --- a/staging/kio/CMakeLists.txt +++ b/staging/kio/CMakeLists.txt @@ -31,6 +31,8 @@ find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus Network Con find_package(X11) set(HAVE_X11 ${X11_FOUND}) +# Enable when kdoctools will be usable from the outside (macros are broken ATM) +#add_subdirectory(docs) add_subdirectory(src) add_subdirectory(autotests) add_subdirectory(tests) diff --git a/staging/kio/docs/CMakeLists.txt b/staging/kio/docs/CMakeLists.txt new file mode 100644 index 0000000..d0338c7 --- /dev/null +++ b/staging/kio/docs/CMakeLists.txt @@ -0,0 +1,2 @@ +add_subdirectory(kcookiejar4) +add_subdirectory(kioslave) diff --git a/staging/kio/doc/design.txt b/staging/kio/docs/design.txt similarity index 100% rename from staging/kio/doc/design.txt rename to staging/kio/docs/design.txt diff --git a/doc/kcookiejar4/CMakeLists.txt b/staging/kio/docs/kcookiejar4/CMakeLists.txt similarity index 100% rename from doc/kcookiejar4/CMakeLists.txt rename to staging/kio/docs/kcookiejar4/CMakeLists.txt diff --git a/doc/kcookiejar4/man-kcookiejar4.8.docbook b/staging/kio/docs/kcookiejar4/man-kcookiejar4.8.docbook similarity index 100% rename from doc/kcookiejar4/man-kcookiejar4.8.docbook rename to staging/kio/docs/kcookiejar4/man-kcookiejar4.8.docbook diff --git a/doc/kioslave/CMakeLists.txt b/staging/kio/docs/kioslave/CMakeLists.txt similarity index 100% rename from doc/kioslave/CMakeLists.txt rename to staging/kio/docs/kioslave/CMakeLists.txt diff --git a/doc/kioslave/data/CMakeLists.txt b/staging/kio/docs/kioslave/data/CMakeLists.txt similarity index 100% rename from doc/kioslave/data/CMakeLists.txt rename to staging/kio/docs/kioslave/data/CMakeLists.txt diff --git a/doc/kioslave/data/index.docbook b/staging/kio/docs/kioslave/data/index.docbook similarity index 100% rename from doc/kioslave/data/index.docbook rename to staging/kio/docs/kioslave/data/index.docbook diff --git a/doc/kioslave/file/CMakeLists.txt b/staging/kio/docs/kioslave/file/CMakeLists.txt similarity index 100% rename from doc/kioslave/file/CMakeLists.txt rename to staging/kio/docs/kioslave/file/CMakeLists.txt diff --git a/doc/kioslave/file/index.docbook b/staging/kio/docs/kioslave/file/index.docbook similarity index 100% rename from doc/kioslave/file/index.docbook rename to staging/kio/docs/kioslave/file/index.docbook diff --git a/doc/kioslave/ftp/CMakeLists.txt b/staging/kio/docs/kioslave/ftp/CMakeLists.txt similarity index 100% rename from doc/kioslave/ftp/CMakeLists.txt rename to staging/kio/docs/kioslave/ftp/CMakeLists.txt diff --git a/doc/kioslave/ftp/index.docbook b/staging/kio/docs/kioslave/ftp/index.docbook similarity index 100% rename from doc/kioslave/ftp/index.docbook rename to staging/kio/docs/kioslave/ftp/index.docbook diff --git a/doc/kioslave/help/CMakeLists.txt b/staging/kio/docs/kioslave/help/CMakeLists.txt similarity index 100% rename from doc/kioslave/help/CMakeLists.txt rename to staging/kio/docs/kioslave/help/CMakeLists.txt diff --git a/doc/kioslave/help/index.docbook b/staging/kio/docs/kioslave/help/index.docbook similarity index 100% rename from doc/kioslave/help/index.docbook rename to staging/kio/docs/kioslave/help/index.docbook diff --git a/doc/kioslave/http/CMakeLists.txt b/staging/kio/docs/kioslave/http/CMakeLists.txt similarity index 100% rename from doc/kioslave/http/CMakeLists.txt rename to staging/kio/docs/kioslave/http/CMakeLists.txt diff --git a/doc/kioslave/http/index.docbook b/staging/kio/docs/kioslave/http/index.docbook similarity index 100% rename from doc/kioslave/http/index.docbook rename to staging/kio/docs/kioslave/http/index.docbook diff --git a/doc/kioslave/mailto/CMakeLists.txt b/staging/kio/docs/kioslave/mailto/CMakeLists.txt similarity index 100% rename from doc/kioslave/mailto/CMakeLists.txt rename to staging/kio/docs/kioslave/mailto/CMakeLists.txt diff --git a/doc/kioslave/mailto/index.docbook b/staging/kio/docs/kioslave/mailto/index.docbook similarity index 100% rename from doc/kioslave/mailto/index.docbook rename to staging/kio/docs/kioslave/mailto/index.docbook diff --git a/doc/kioslave/rlogin/CMakeLists.txt b/staging/kio/docs/kioslave/rlogin/CMakeLists.txt similarity index 100% rename from doc/kioslave/rlogin/CMakeLists.txt rename to staging/kio/docs/kioslave/rlogin/CMakeLists.txt diff --git a/doc/kioslave/rlogin/index.docbook b/staging/kio/docs/kioslave/rlogin/index.docbook similarity index 100% rename from doc/kioslave/rlogin/index.docbook rename to staging/kio/docs/kioslave/rlogin/index.docbook diff --git a/doc/kioslave/telnet/CMakeLists.txt b/staging/kio/docs/kioslave/telnet/CMakeLists.txt similarity index 100% rename from doc/kioslave/telnet/CMakeLists.txt rename to staging/kio/docs/kioslave/telnet/CMakeLists.txt diff --git a/doc/kioslave/telnet/index.docbook b/staging/kio/docs/kioslave/telnet/index.docbook similarity index 100% rename from doc/kioslave/telnet/index.docbook rename to staging/kio/docs/kioslave/telnet/index.docbook diff --git a/doc/kioslave/webdav/CMakeLists.txt b/staging/kio/docs/kioslave/webdav/CMakeLists.txt similarity index 100% rename from doc/kioslave/webdav/CMakeLists.txt rename to staging/kio/docs/kioslave/webdav/CMakeLists.txt diff --git a/doc/kioslave/webdav/index.docbook b/staging/kio/docs/kioslave/webdav/index.docbook similarity index 100% rename from doc/kioslave/webdav/index.docbook rename to staging/kio/docs/kioslave/webdav/index.docbook diff --git a/staging/kio/doc/krun-passing-slaves.txt b/staging/kio/docs/krun-passing-slaves.txt similarity index 100% rename from staging/kio/doc/krun-passing-slaves.txt rename to staging/kio/docs/krun-passing-slaves.txt diff --git a/staging/kio/doc/metadata.txt b/staging/kio/docs/metadata.txt similarity index 100% rename from staging/kio/doc/metadata.txt rename to staging/kio/docs/metadata.txt
