[kde-doc-english] [kdelibs/frameworks] /: Move kde-config to kde4support and rename binary kde5-config to kf5-config
Jignesh Kakadiya
jigneshhk1992 at gmail.com
Thu Feb 21 13:31:14 UTC 2013
Git commit 82e4b020107ce095b21304c52ef61adb2581f464 by Jignesh Kakadiya.
Committed on 21/02/2013 at 14:30.
Pushed by kakadiya into branch 'frameworks'.
Move kde-config to kde4support and rename binary kde5-config to kf5-config
M +7 -7 doc/kde5-config/man-kde5-config.1.docbook
M +0 -7 kdecore/CMakeLists.txt
M +3 -3 kdecore/kernel/kstandarddirs.h
M +1 -1 kdecore/tests/kconfignokdehometest.cpp
M +1 -1 kdecore/tests/kstandarddirstest.cpp
M +6 -0 staging/kde4support/CMakeLists.txt
R +1 -1 staging/kde4support/kde-config.cpp [from: kdecore/kde-config.cpp - 099% similarity]
http://commits.kde.org/kdelibs/82e4b020107ce095b21304c52ef61adb2581f464
diff --git a/doc/kde5-config/man-kde5-config.1.docbook b/doc/kde5-config/man-kde5-config.1.docbook
index a14409d..ae567bf 100644
--- a/doc/kde5-config/man-kde5-config.1.docbook
+++ b/doc/kde5-config/man-kde5-config.1.docbook
@@ -16,18 +16,18 @@
</refentryinfo>
<refmeta>
-<refentrytitle><command>kde5-config</command></refentrytitle>
+<refentrytitle><command>kf5-config</command></refentrytitle>
<manvolnum>1</manvolnum>
</refmeta>
<refnamediv>
-<refname><command>kde5-config</command></refname>
+<refname><command>kf5-config</command></refname>
<refpurpose>Prints &kde; installation paths</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
-<command>kde5-config</command>
+<command>kf5-config</command>
<arg>--expandvars</arg>
<arg>--prefix</arg>
<arg>--exec-prefix</arg>
@@ -43,7 +43,7 @@
<refsect1>
<title>Description</title>
-<para>kde5-config is a command line program used to retrieve information
+<para>kf5-config is a command line program used to retrieve information
about &kde; installation or user paths.</para>
<para>Use this program to determine where the various aspects of the &kde;
@@ -134,21 +134,21 @@ installation reside on your system.
<para>Print the top-level &kde; installation directory:</para>
<para>
-<prompt>%</prompt><userinput> <command>kde5-config --prefix</command>
+<prompt>%</prompt><userinput> <command>kf5-config --prefix</command>
</userinput>
</para>
<para>Print a list of all resource types:</para>
<para>
-<prompt>%</prompt><userinput> <command>kde5-config --types</command>
+<prompt>%</prompt><userinput> <command>kf5-config --types</command>
</userinput>
</para>
<para>Print the installed wallpaper path:</para>
<para>
-<prompt>%</prompt><userinput> <command>kde5-config --path wallpaper</command>
+<prompt>%</prompt><userinput> <command>kf5-config --path wallpaper</command>
</userinput>
</para>
diff --git a/kdecore/CMakeLists.txt b/kdecore/CMakeLists.txt
index 105cecd..829cb75 100644
--- a/kdecore/CMakeLists.txt
+++ b/kdecore/CMakeLists.txt
@@ -242,13 +242,6 @@ install(TARGETS kdecore EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_A
configure_file(localization/all_languages.desktop ${CMAKE_CURRENT_BINARY_DIR}/all_languages @ONLY)
-kde4_add_executable(kde5-config NOGUI kde-config.cpp )
-
-target_link_libraries(kde5-config ${KDE4_KDECORE_LIBS} kcoreaddons)
-
-install(TARGETS kde5-config ${INSTALL_TARGETS_DEFAULT_ARGS} )
-
-
########### install files ###############
install( FILES ${CMAKE_CURRENT_BINARY_DIR}/all_languages DESTINATION ${LOCALE_INSTALL_DIR} )
install( FILES localization/entry.desktop DESTINATION ${LOCALE_INSTALL_DIR}/en_US )
diff --git a/kdecore/kernel/kstandarddirs.h b/kdecore/kernel/kstandarddirs.h
index 37b16d9..711d8e0 100644
--- a/kdecore/kernel/kstandarddirs.h
+++ b/kdecore/kernel/kstandarddirs.h
@@ -317,9 +317,9 @@ public:
* then look into the subdir lib of all elements of all prefixes
* ($KDEDIRS) for a file libkdecore.la and return the path to
* the first one it finds (e.g. /opt/kde/lib/libkdecore.la).
- * You can use the program kde5-config to list all resource types:
+ * You can use the program kf5-config to list all resource types:
* @code
- * $ kde5-config --types
+ * $ kf5-config --types
* @endcode
*
* Example:
@@ -455,7 +455,7 @@ public:
* @param type The type of resource to locate directories for. Can be icon,
* lib, pixmap, .... To get a complete list, call
* @code
- * kde5-config --types
+ * kf5-config --types
* @endcode
* @param filter Only accept filenames that fit to filter. The filter
* may consist of an optional directory and a QRegExp
diff --git a/kdecore/tests/kconfignokdehometest.cpp b/kdecore/tests/kconfignokdehometest.cpp
index 50361fc..2702358 100644
--- a/kdecore/tests/kconfignokdehometest.cpp
+++ b/kdecore/tests/kconfignokdehometest.cpp
@@ -47,7 +47,7 @@ void KConfigNoKdeHomeTest::testNoKdeHome()
xdgConfigHomeDir.removeRecursively();
QVERIFY(!QFile::exists(xdgConfigHome));
- // Do what kde5-config does, and ensure kdehome doesn't get created (#233892)
+ // Do what kf5-config does, and ensure kdehome doesn't get created (#233892)
QVERIFY(!QFile::exists(xdgConfigHome));
KGlobal::dirs();
QVERIFY(!QFile::exists(xdgConfigHome));
diff --git a/kdecore/tests/kstandarddirstest.cpp b/kdecore/tests/kstandarddirstest.cpp
index c1aab70..c7978ad 100644
--- a/kdecore/tests/kstandarddirstest.cpp
+++ b/kdecore/tests/kstandarddirstest.cpp
@@ -411,7 +411,7 @@ void KStandarddirsTest::testAddResourceDir()
void KStandarddirsTest::testSetXdgDataDirs()
{
- // By default we should have KDEDIR/share/applications in `kde5-config --path xdgdata-apps`
+ // By default we should have KDEDIR/share/applications in `kf5-config --path xdgdata-apps`
const QStringList dirs = KGlobal::dirs()->resourceDirs("xdgdata-apps");
const QString kdeDataApps = KStandardDirs::realPath(CMAKE_INSTALL_PREFIX "/share/applications/");
if (!dirs.contains(kdeDataApps)) {
diff --git a/staging/kde4support/CMakeLists.txt b/staging/kde4support/CMakeLists.txt
index b41fc81..6c2757e 100644
--- a/staging/kde4support/CMakeLists.txt
+++ b/staging/kde4support/CMakeLists.txt
@@ -16,6 +16,7 @@ ecm_version(5 0 0)
include(ECMQtFramework)
include(ECMWriteVersionHeader)
+include_directories( ${KDE4_KDECORE_INCLUDES} )
find_package(Qt5Transitional REQUIRED MODULE COMPONENTS Core X11Extras)
@@ -26,6 +27,11 @@ remove_definitions(-DQT_NO_KEYWORDS)
ecm_write_version_header(${CMAKE_CURRENT_BINARY_DIR}/kde4support_version.h)
+kde4_add_executable(kf5-config NOGUI kde-config.cpp )
+
+target_link_libraries(kf5-config ${KDE4_KDECORE_LIBS} kcoreaddons)
+
+install(TARGETS kf5-config ${INSTALL_TARGETS_DEFAULT_ARGS} )
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kde4support_version.h
DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel )
diff --git a/kdecore/kde-config.cpp b/staging/kde4support/kde-config.cpp
similarity index 99%
rename from kdecore/kde-config.cpp
rename to staging/kde4support/kde-config.cpp
index 4c046c6..cc7be58 100644
--- a/kdecore/kde-config.cpp
+++ b/staging/kde4support/kde-config.cpp
@@ -56,7 +56,7 @@ static void printResult(const QString &s)
int main(int argc, char **argv)
{
QCoreApplication app(argc, argv);
- KAboutData about("kde5-config", "kdelibs4", qi18n("kde5-config"), "1.0",
+ KAboutData about("kf5-config", "kdelibs4", qi18n("kf5-config"), "1.0",
qi18n("A little program to output installation paths"),
KAboutData::License_GPL,
qi18n("(C) 2000 Stephan Kulow"));
More information about the kde-doc-english
mailing list