Git commit c1c6a78a9a3679c71b3614f5ebcfb8490ca6db1b by David Faure. Committed on 18/09/2016 at 19:43. Pushed by dfaure into branch 'master'.
Move konqueror's doc into konqueror/doc M +0 -1 CMakeLists.txt D +0 -6 doc/CMakeLists.txt R +2 -1 konqueror/doc/CMakeLists.txt [from: doc/konqueror/CMakeLists.txt - 087% similarity] R +- -- konqueror/doc/cmndline.png [from: doc/konqueror/cmndline.png - 100% similarity] R +- -- konqueror/doc/dirtree.png [from: doc/konqueror/dirtree.png - 100% similarity] R +- -- konqueror/doc/dragdrop.png [from: doc/konqueror/dragdrop.png - 100% similarity] R +- -- konqueror/doc/folders.png [from: doc/konqueror/folders.png - 100% similarity] R +- -- konqueror/doc/format-font-size-less.png [from: doc/konqueror/format-font-size-less.png - 100% similarity] R +- -- konqueror/doc/format-font-size-more.png [from: doc/konqueror/format-font-size-more.png - 100% similarity] R +- -- konqueror/doc/go-jump.png [from: doc/konqueror/go-jump.png - 100% similarity] R +- -- konqueror/doc/grouping-view.png [from: doc/konqueror/grouping-view.png - 100% similarity] R +0 -0 konqueror/doc/index.docbook [from: doc/konqueror/index.docbook - 100% similarity] R +- -- konqueror/doc/konqorg.png [from: doc/konqueror/konqorg.png - 100% similarity] R +- -- konqueror/doc/look.png [from: doc/konqueror/look.png - 100% similarity] R +0 -0 konqueror/doc/man-kbookmarkmerger.1.docbook [from: doc/konqueror/man-kbookmarkmerger.1.docbook - 100% similarity] R +- -- konqueror/doc/parts.png [from: doc/konqueror/parts.png - 100% similarity] R +- -- konqueror/doc/reset.png [from: doc/konqueror/reset.png - 100% similarity] R +- -- konqueror/doc/thumbnails.png [from: doc/konqueror/thumbnails.png - 100% similarity] R +- -- konqueror/doc/viewproperties-dialog.png [from: doc/konqueror/viewproperties-dialog.png - 100% similarity] http://commits.kde.org/kde-baseapps/c1c6a78a9a3679c71b3614f5ebcfb8490ca6db1b diff --git a/CMakeLists.txt b/CMakeLists.txt index 8652a64..4289d5b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,6 @@ include(FeatureSummary) add_subdirectory(lib) add_subdirectory(kdialog) -add_subdirectory(doc) if(NOT WIN32) add_subdirectory(kdepasswd) endif() diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt deleted file mode 100644 index 47994fa..0000000 --- a/doc/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -find_package(ECM 1.7.0 CONFIG REQUIRED) -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH}) - -find_package(KF5 ${KF5_MIN_VERSION} REQUIRED DocTools) - -add_subdirectory(konqueror) diff --git a/doc/konqueror/CMakeLists.txt b/konqueror/doc/CMakeLists.txt similarity index 87% rename from doc/konqueror/CMakeLists.txt rename to konqueror/doc/CMakeLists.txt index 0064d72..6f75c10 100644 --- a/doc/konqueror/CMakeLists.txt +++ b/konqueror/doc/CMakeLists.txt @@ -1,5 +1,6 @@ ########### install files ############### -# + +find_package(KF5 REQUIRED DocTools) kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR konqueror) kdoctools_create_manpage(man-kbookmarkmerger.1.docbook 1 INSTALL_DESTINATION ${KDE_INSTALL_MANDIR}) diff --git a/doc/konqueror/cmndline.png b/konqueror/doc/cmndline.png similarity index 100% rename from doc/konqueror/cmndline.png rename to konqueror/doc/cmndline.png diff --git a/doc/konqueror/dirtree.png b/konqueror/doc/dirtree.png similarity index 100% rename from doc/konqueror/dirtree.png rename to konqueror/doc/dirtree.png diff --git a/doc/konqueror/dragdrop.png b/konqueror/doc/dragdrop.png similarity index 100% rename from doc/konqueror/dragdrop.png rename to konqueror/doc/dragdrop.png diff --git a/doc/konqueror/folders.png b/konqueror/doc/folders.png similarity index 100% rename from doc/konqueror/folders.png rename to konqueror/doc/folders.png diff --git a/doc/konqueror/format-font-size-less.png b/konqueror/doc/format-font-size-less.png similarity index 100% rename from doc/konqueror/format-font-size-less.png rename to konqueror/doc/format-font-size-less.png diff --git a/doc/konqueror/format-font-size-more.png b/konqueror/doc/format-font-size-more.png similarity index 100% rename from doc/konqueror/format-font-size-more.png rename to konqueror/doc/format-font-size-more.png diff --git a/doc/konqueror/go-jump.png b/konqueror/doc/go-jump.png similarity index 100% rename from doc/konqueror/go-jump.png rename to konqueror/doc/go-jump.png diff --git a/doc/konqueror/grouping-view.png b/konqueror/doc/grouping-view.png similarity index 100% rename from doc/konqueror/grouping-view.png rename to konqueror/doc/grouping-view.png diff --git a/doc/konqueror/index.docbook b/konqueror/doc/index.docbook similarity index 100% rename from doc/konqueror/index.docbook rename to konqueror/doc/index.docbook diff --git a/doc/konqueror/konqorg.png b/konqueror/doc/konqorg.png similarity index 100% rename from doc/konqueror/konqorg.png rename to konqueror/doc/konqorg.png diff --git a/doc/konqueror/look.png b/konqueror/doc/look.png similarity index 100% rename from doc/konqueror/look.png rename to konqueror/doc/look.png diff --git a/doc/konqueror/man-kbookmarkmerger.1.docbook b/konqueror/doc/man-kbookmarkmerger.1.docbook similarity index 100% rename from doc/konqueror/man-kbookmarkmerger.1.docbook rename to konqueror/doc/man-kbookmarkmerger.1.docbook diff --git a/doc/konqueror/parts.png b/konqueror/doc/parts.png similarity index 100% rename from doc/konqueror/parts.png rename to konqueror/doc/parts.png diff --git a/doc/konqueror/reset.png b/konqueror/doc/reset.png similarity index 100% rename from doc/konqueror/reset.png rename to konqueror/doc/reset.png diff --git a/doc/konqueror/thumbnails.png b/konqueror/doc/thumbnails.png similarity index 100% rename from doc/konqueror/thumbnails.png rename to konqueror/doc/thumbnails.png diff --git a/doc/konqueror/viewproperties-dialog.png b/konqueror/doc/viewproperties-dialog.png similarity index 100% rename from doc/konqueror/viewproperties-dialog.png rename to konqueror/doc/viewproperties-dialog.png
