[sdk/kdesrc-build/docbook_historied_per_file] doc: doc: Digia now maintains Qt, not Nokia.

Michael Pyne null at kde.org
Fri May 10 10:15:58 BST 2024


Git commit aed033ed56a4347b65a8c66f18742cc17abadd4e by Michael Pyne.
Committed on 10/11/2012 at 03:04.
Pushed by ashark into branch 'docbook_historied_per_file'.

doc: Digia now maintains Qt, not Nokia.

BUG:309713
FIXED-IN:1.16

Original commit: 8c038f9b
https://invent.kde.org/sdk/kdesrc-build/-/commit/8c038f9bcb66e3e8adcc11bc587f6258bc66d2b6

M  +0    -26   doc/cmdline/supported-cmdline-params.docbook
M  +1    -1    doc/getting-started/kde-modules-and-selection.docbook

https://invent.kde.org/sdk/kdesrc-build/-/commit/aed033ed56a4347b65a8c66f18742cc17abadd4e

diff --git a/doc/cmdline/supported-cmdline-params.docbook b/doc/cmdline/supported-cmdline-params.docbook
index cc2498ba..2c435608 100644
--- a/doc/cmdline/supported-cmdline-params.docbook
+++ b/doc/cmdline/supported-cmdline-params.docbook
@@ -356,32 +356,6 @@ aid.</para></note>
 </listitem>
 </varlistentry>
 
-<varlistentry id="cmdline-delete-my-patches">
-<term><parameter>--delete-my-patches</parameter></term>
-<listitem><para>
-This option is used to let &kdesrc-build; delete source directories that may
-contain user data, so that the module can be re-downloaded. This would normally
-only be useful for &kde; developers (who might have local changes that would be
-deleted).</para>
-
-<para>This is currently only used to checkout modules that have been converted
-from &subversion; to &git;. You should not use this option normally,
-&kdesrc-build; will prompt to be re-run with it if it is needed.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry id="cmdline-delete-my-settings">
-<term><parameter>--delete-my-settings</parameter></term>
-<listitem><para>
-This option is used to let &kdesrc-build; overwrite existing files which may contain
-user data.</para>
-
-<para>This is currently only used for xsession setup for the login manager. You
-should not use this option normally, &kdesrc-build; will prompt to be re-run
-with it if it is needed.</para>
-</listitem>
-</varlistentry>
-
 <varlistentry id="cmdline-global-option">
 <term><parameter>--<option-name>=</parameter></term>
 <listitem><para>
diff --git a/doc/getting-started/kde-modules-and-selection.docbook b/doc/getting-started/kde-modules-and-selection.docbook
index 67142d47..11d1b0f4 100644
--- a/doc/getting-started/kde-modules-and-selection.docbook
+++ b/doc/getting-started/kde-modules-and-selection.docbook
@@ -11,7 +11,7 @@ select the software modules that you want built.
 </para>
 
 <orderedlist>
-<listitem><para>At the lowest level comes Nokia's &Qt; library, which is a
+<listitem><para>At the lowest level comes Digia's &Qt; library, which is a
 very powerful, cross-platform <quote>toolkit</quote> library. &kde; is based on
 &Qt;, and some of the non-&kde; libraries required by &kde; are also based on
 &Qt;. &kdesrc-build; can build &Qt;, or use the one already installed on your



More information about the kde-doc-english mailing list