summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeslie Zhai <xiangzhai83@gmail.com>2016-08-29 03:55:34 (GMT)
committerLeslie Zhai <xiangzhai83@gmail.com>2016-08-29 03:55:34 (GMT)
commitd260f55955ce13891a681b34d344157c08445846 (patch)
tree37414612f4e4961000b61e07294cdfab4ddd89d4
parentd1b7836cbac7240fb4224a126514fbdd61353d99 (diff)
Fix file conflicts with kdelibs4-version issue.
-rw-r--r--kcmcddb/doc/CMakeLists.txt2
-rw-r--r--kcmcddb/libkcddb.desktop2
-rw-r--r--libkcddb/CMakeLists.txt2
-rw-r--r--libkcddb/configbase.kcfgc2
-rw-r--r--libkcddb/libkcddb5.kcfg (renamed from libkcddb/libkcddb.kcfg)0
5 files changed, 4 insertions, 4 deletions
diff --git a/kcmcddb/doc/CMakeLists.txt b/kcmcddb/doc/CMakeLists.txt
index 5839d56..9a9a89a 100644
--- a/kcmcddb/doc/CMakeLists.txt
+++ b/kcmcddb/doc/CMakeLists.txt
@@ -1 +1 @@
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/cddbretrieval)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/cddbretrieval5)
diff --git a/kcmcddb/libkcddb.desktop b/kcmcddb/libkcddb.desktop
index afda94e..05d13b1 100644
--- a/kcmcddb/libkcddb.desktop
+++ b/kcmcddb/libkcddb.desktop
@@ -7,7 +7,7 @@ X-KDE-System-Settings-Parent-Category=audio-and-video
X-KDE-Library=kcm_cddb
X-KDE-ParentApp=kcontrol
-X-DocPath=kcontrol/cddbretrieval/index.html
+X-DocPath=kcontrol/cddbretrieval5/index.html
Name=CDDB Retrieval
Name[bg]=Изтегляне на данни от CDDB
diff --git a/libkcddb/CMakeLists.txt b/libkcddb/CMakeLists.txt
index 02f1335..1c6436a 100644
--- a/libkcddb/CMakeLists.txt
+++ b/libkcddb/CMakeLists.txt
@@ -116,4 +116,4 @@ include(ECMGeneratePriFile)
ecm_generate_pri_file(BASE_NAME KCddb LIB_NAME KF5Cddb DEPS "Qt5Widgets" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KCddb)
install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})
-install(FILES libkcddb.kcfg DESTINATION ${KCFG_INSTALL_DIR})
+install(FILES libkcddb5.kcfg DESTINATION ${KCFG_INSTALL_DIR})
diff --git a/libkcddb/configbase.kcfgc b/libkcddb/configbase.kcfgc
index 7692fc9..9e9ba06 100644
--- a/libkcddb/configbase.kcfgc
+++ b/libkcddb/configbase.kcfgc
@@ -1,5 +1,5 @@
ClassName=ConfigBase
-File=libkcddb.kcfg
+File=libkcddb5.kcfg
Mutators=true
IncludeFiles=kcddb_export.h
Visibility=KCDDB_EXPORT
diff --git a/libkcddb/libkcddb.kcfg b/libkcddb/libkcddb5.kcfg
index 26649ac..26649ac 100644
--- a/libkcddb/libkcddb.kcfg
+++ b/libkcddb/libkcddb5.kcfg