diff options
| author | David Faure <david.faure@kdab.com> | 2014-02-01 14:52:46 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-13 15:38:41 +0100 |
| commit | 49b44d477be31d3ebd75440e0963f55b96ce011d (patch) | |
| tree | e3d856adee9be688295b62801cec95018feec662 | |
| parent | 9e399a7d41da4ff69cd8ec0e335d5777a5274969 (diff) | |
Update app icon docu from kde3 to both kde4 and kf5
Change-Id: I0dff98aec55b93245ba04f955a9c5f82ef784fe4
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| -rw-r--r-- | doc/src/howtos/appicon.qdoc | 14 | ||||
| -rw-r--r-- | doc/src/snippets/code/doc_src_appicon.qdoc | 7 |
2 files changed, 14 insertions, 7 deletions
diff --git a/doc/src/howtos/appicon.qdoc b/doc/src/howtos/appicon.qdoc index 1d0be0dc2..9a57b92c8 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 diff --git a/doc/src/snippets/code/doc_src_appicon.qdoc b/doc/src/snippets/code/doc_src_appicon.qdoc index f75c0617a..d15863e69 100644 --- a/doc/src/snippets/code/doc_src_appicon.qdoc +++ b/doc/src/snippets/code/doc_src_appicon.qdoc @@ -44,10 +44,13 @@ IDI_ICON1 ICON DISCARDABLE "myappico.ico" //! [3] -kde-config --path icon +kde4-config --path icon //! [3] - //! [4] gnome-config --datadir //! [4] + +//! [5] +qtpaths --locate-dirs GenericDataLocation icons +//! [5] |