[kde-doc-english] [kde-runtime/frameworks] /: Merge commit '6e8fe64' into frameworks
David Faure
faure at kde.org
Thu Mar 20 22:04:58 UTC 2014
Git commit 7f4f3fca96ec7082d5f50c8f5f591eaa966c6715 by David Faure.
Committed on 20/03/2014 at 21:55.
Pushed by dfaure into branch 'frameworks'.
Merge commit '6e8fe64' into frameworks
Conflicts:
doc/kcontrol/filetypes/index.docbook [version, solved]
doc/kcontrol/nepomuk/index.docbook [deleted]
khelpcenter/navigator.cpp [qcDebug]
kioslave/CMakeLists.txt [macro_optional_find_package]
kwalletd/* [moved out -> merged changes by hand, lots of fun]
M +5 -3 doc/fundamentals/index.docbook
M +4 -4 doc/kcontrol/attica/index.docbook
M +2 -2 doc/kcontrol/componentchooser/index.docbook
M +2 -2 doc/kcontrol/emoticons/index.docbook
M +8 -7 doc/kcontrol/filetypes/index.docbook
M +2 -2 doc/kcontrol/icons/index.docbook
M +2 -2 doc/kcontrol/kcm_ssl/index.docbook
M +2 -2 doc/kcontrol/kcmlaunch/index.docbook
M +2 -2 doc/kcontrol/kcmnotify/index.docbook
M +2 -2 doc/kcontrol/kded/index.docbook
M +49 -7 doc/kcontrol/language/index.docbook
M +2 -2 doc/kcontrol/netpref/index.docbook
M +32 -14 doc/kcontrol/phonon/index.docbook
M +2 -2 doc/kcontrol/proxy/index.docbook
M +2 -2 doc/kcontrol/smb/index.docbook
M +2 -2 doc/kcontrol/solid-device-automounter/index.docbook
M +2 -2 doc/kcontrol/spellchecking/index.docbook
M +34 -2 khelpcenter/navigator.cpp
M +8 -0 khelpcenter/plugintraverser.cpp
M +1 -1 kioslave/CMakeLists.txt
M +1 -1 kioslave/sftp/CMakeLists.txt
M +48 -21 kioslave/sftp/kio_sftp.cpp
M +28 -5 kpasswdserver/tests/kpasswdservertest.cpp
http://commits.kde.org/kde-runtime/7f4f3fca96ec7082d5f50c8f5f591eaa966c6715
diff --cc doc/kcontrol/filetypes/index.docbook
index 7b9fe33,36a3129..3f9c03d
--- a/doc/kcontrol/filetypes/index.docbook
+++ b/doc/kcontrol/filetypes/index.docbook
@@@ -1,6 -1,7 +1,7 @@@
<?xml version="1.0" ?>
-<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
-"dtd/kdex.dtd" [
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN"
+"dtd/kdedbx45.dtd" [
+ <!ENTITY calligrawords "<application>Calligra Words</application>">
<!ENTITY % addindex "IGNORE">
<!ENTITY % English "INCLUDE" > <!-- change language only here -->
]>
diff --cc khelpcenter/navigator.cpp
index f0408f2,84be06b..c2b6970
--- a/khelpcenter/navigator.cpp
+++ b/khelpcenter/navigator.cpp
@@@ -218,7 -220,30 +218,30 @@@ void Navigator::insertParentAppDocs( co
void Navigator::insertKCMDocs( const QString &name, NavigatorItem *topItem, const QString &type )
{
- kDebug(1400) << "Requested KCM documents for ID" << name;
+ qCDebug(category) << "Requested KCM documents for ID" << name;
+ QString systemsettingskontrolconstraint = "[X-KDE-System-Settings-Parent-Category] != ''";
+ QString konquerorcontrolconstraint = "[X-KDE-PluginKeyword] == 'khtml_general'\
+ or [X-KDE-PluginKeyword] == 'performance'\
+ or [X-KDE-PluginKeyword] == 'bookmarks'";
+ QString filemanagercontrolconstraint = "[X-KDE-PluginKeyword] == 'behavior'\
+ or [X-KDE-PluginKeyword] == 'dolphinviewmodes'\
+ or [X-KDE-PluginKeyword] == 'dolphinnavigation'\
+ or [X-KDE-PluginKeyword] == 'dolphinservices'\
+ or [X-KDE-PluginKeyword] == 'dolphingeneral'\
+ or [X-KDE-PluginKeyword] == 'trash'";
+ QString browsercontrolconstraint = "[X-KDE-PluginKeyword] == 'khtml_behavior'\
+ or [X-KDE-PluginKeyword] == 'proxy'\
+ or [X-KDE-PluginKeyword] == 'khtml_appearance'\
+ or [X-KDE-PluginKeyword] == 'khtml_filter'\
+ or [X-KDE-PluginKeyword] == 'cache'\
+ or [X-KDE-PluginKeyword] == 'cookie'\
+ or [X-KDE-PluginKeyword] == 'useragent'\
+ or [X-KDE-PluginKeyword] == 'khtml_java_js'\
+ or [X-KDE-PluginKeyword] == 'khtml_plugins'";
+ /* missing in browsercontrolconstraint
+ History no X-KDE-PluginKeyword in kcmhistory.desktop
+ */
+ QString othercontrolconstraint = "[X-KDE-PluginKeyword] == 'cgi'";
KService::List list;
@@@ -230,11 -263,12 +261,12 @@@
for ( KService::List::const_iterator it = list.constBegin(); it != list.constEnd(); ++it )
{
- KService::Ptr s = (*it);
- KCModuleInfo m = KCModuleInfo(s);
- QString desktopFile = KStandardDirs::locate( "services", m.fileName() );
+ KService::Ptr s(*it);
+ KCModuleInfo m(s);
+ QString desktopFile = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QLatin1String("kde5/services/") + m.fileName() );
createItemFromDesktopFile( topItem, desktopFile );
}
+ topItem->sortChildren( 0, Qt::AscendingOrder /* ascending */ );
}
void Navigator::insertIOSlaveDocs( const QString &name, NavigatorItem *topItem )
diff --cc kioslave/CMakeLists.txt
index 6acff2d,b150290..17f3d31
--- a/kioslave/CMakeLists.txt
+++ b/kioslave/CMakeLists.txt
@@@ -1,17 -1,17 +1,17 @@@
if(NOT WIN32)
-# we need a version of samba which has already smbc_set_context(), Alex
-set(SAMBA_REQUIRE_SMBC_SET_CONTEXT TRUE)
-set(SAMBA_REQUIRE_SMBC_OPTION_SET TRUE)
-macro_optional_find_package(Samba)
-set_package_properties(Samba PROPERTIES DESCRIPTION "the SMB client library, a version with smbc_set_context() and smbc_option_set()"
- URL "http://www.samba.org"
- TYPE OPTIONAL
- PURPOSE "Needed to build the SMB kioslave"
- )
+ # we need a version of samba which has already smbc_set_context(), Alex
+ set(SAMBA_REQUIRE_SMBC_SET_CONTEXT TRUE)
+ set(SAMBA_REQUIRE_SMBC_OPTION_SET TRUE)
+ find_package(Samba)
+ set_package_properties(Samba PROPERTIES DESCRIPTION "the SMB client library, a version with smbc_set_context() and smbc_option_set()"
+ URL "http://www.samba.org"
+ TYPE OPTIONAL
+ PURPOSE "Needed to build the SMB kioslave"
+ )
endif(NOT WIN32)
- find_package(LibSSH 0.4.0)
-macro_optional_find_package(LibSSH 0.6.0)
++find_package(LibSSH 0.6.0)
set_package_properties(LibSSH PROPERTIES DESCRIPTION "the SSH library with SFTP support"
URL "http://www.libssh.org/"
TYPE OPTIONAL
diff --cc kioslave/sftp/CMakeLists.txt
index 7ce8aa3,dcf5b4d..3a33d3d
--- a/kioslave/sftp/CMakeLists.txt
+++ b/kioslave/sftp/CMakeLists.txt
@@@ -4,10 -4,10 +4,10 @@@ set(kio_sftp_PART_SRC
kio_sftp.cpp
)
- include_directories(${LIBSSH_INCLUDE_DIRS})
+ include_directories(${LIBSSH_INCLUDE_DIR})
-kde4_add_plugin(kio_sftp ${kio_sftp_PART_SRCS})
-target_link_libraries(kio_sftp ${KDE4_KIO_LIBS} ${LIBSSH_LIBRARIES})
+add_library(kio_sftp MODULE ${kio_sftp_PART_SRCS})
+target_link_libraries(kio_sftp KF5::KIOCore ${LIBSSH_LIBRARIES})
install(TARGETS kio_sftp DESTINATION ${PLUGIN_INSTALL_DIR} )
More information about the kde-doc-english
mailing list