diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-17 11:35:03 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-17 11:35:03 +0100 |
commit | c94ae31c363aaee26757eb5b0e36857bb665c88e (patch) | |
tree | 411e70087380fbc870340dea1a1f17c35558867a /doc/src/howtos | |
parent | 3f440b287a6b40f539eb91acb16a3d972829130d (diff) | |
parent | 19245e88bae96a8f3757c8db8e5f3104eae12db9 (diff) | |
download | qtdoc-c94ae31c363aaee26757eb5b0e36857bb665c88e.tar.gz |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I85e26bb2a47f9ac7a9417d514dd696723f902082
Diffstat (limited to 'doc/src/howtos')
-rw-r--r-- | doc/src/howtos/appicon.qdoc | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/doc/src/howtos/appicon.qdoc b/doc/src/howtos/appicon.qdoc index 1d0be0dc..9a57b92c 100644 --- a/doc/src/howtos/appicon.qdoc +++ b/doc/src/howtos/appicon.qdoc @@ -161,12 +161,16 @@ \section2 K Desktop Environment (KDE) Application icons can be installed for use by all users, or on a per-user basis. - A user currently logged into their KDE desktop can discover these locations - by using \l{http://developer.kde.org/documentation/other/kde-config.html}{kde-config}, - for example, by typing the following in a terminal window: + A user currently logged into their KDE 4 desktop can discover these locations + by using kde4-config, for example, by typing the following in a terminal window: \snippet snippets/code/doc_src_appicon.qdoc 3 + Applications using Qt 5 and KDE Frameworks 5 will find their icons in the list + returned by this command: + + \snippet snippets/code/doc_src_appicon.qdoc 5 + Typically, the list of colon-separated paths printed to stdout includes the user-specific icon path and the system-wide path. Beneath these directories, it should be possible to locate and install icons according @@ -175,11 +179,11 @@ If you are developing exclusively for KDE, you may wish to take advantage of the \link - http://developer.kde.org/documentation/other/makefile_am_howto.html + http://techbase.kde.org/Development/CMake/Addons_for_KDE KDE build system\endlink to configure your application. This ensures that your icons are installed in the appropriate locations for KDE. - The KDE developer website is at \l{http://developer.kde.org/}. + The KDE developer website is at \l{http://techbase.kde.org/}. \section2 GNOME |