[sdk/kdesrc-build/docbook_historied_per_file] doc: qt-copy is gone, replace it with qt
Burkhard Lück
null at kde.org
Fri May 10 10:15:11 BST 2024
Git commit d438cade4b6b605a8ab4e6241b9b410868257c4c by Burkhard Lück.
Committed on 02/05/2012 at 05:48.
Pushed by ashark into branch 'docbook_historied_per_file'.
qt-copy is gone, replace it with qt
CCMAIL:mpyne at kde.org
Original commit: 60139c74
https://invent.kde.org/sdk/kdesrc-build/-/commit/60139c74bb310d0df7b18813737b2511d7b8eeb2
M +3 -3 doc/features/features-overview.docbook
M +1 -1 doc/getting-started/before-building.docbook
M +3 -3 doc/getting-started/configure-data.docbook
M +3 -3 doc/getting-started/environment.docbook
M +1 -1 doc/getting-started/kde-modules-and-selection.docbook
M +8 -8 doc/kdesrc-buildrc/conf-options-table.docbook
M +6 -6 doc/using-kdesrc-build/basic-features.docbook
M +1 -1 doc/using-kdesrc-build/other-features.docbook
https://invent.kde.org/sdk/kdesrc-build/-/commit/d438cade4b6b605a8ab4e6241b9b410868257c4c
diff --git a/doc/features/features-overview.docbook b/doc/features/features-overview.docbook
index b35af68c..586966e2 100644
--- a/doc/features/features-overview.docbook
+++ b/doc/features/features-overview.docbook
@@ -48,8 +48,8 @@ including optionally applying &kde;-recommended bugfix and optimization patches
to the module.
<note><para>For historical reasons, the &kdesrc-build; module used to build
-&Qt; should be called <literal>qt-copy</literal>. See also <xref
-linkend="using-qt-copy"/>.
+&Qt; should be called <literal>qt</literal>. See also <xref
+linkend="using-qt"/>.
</para></note>
</para></listitem>
@@ -150,7 +150,7 @@ a base &kde; single-user installation from the anonymous source repositories.
<listitem><para>
Tilde-expansion for your configuration options. For example, you can
specify:
-<programlisting>qtdir ~/kdesrc/build/qt-copy</programlisting>
+<programlisting>qtdir ~/kdesrc/build/qt</programlisting>
</para></listitem>
<listitem><para>
diff --git a/doc/getting-started/before-building.docbook b/doc/getting-started/before-building.docbook
index bd13f7f0..934dd803 100644
--- a/doc/getting-started/before-building.docbook
+++ b/doc/getting-started/before-building.docbook
@@ -68,7 +68,7 @@ to use the &Qt; copy, you need to do these things:</para>
<itemizedlist>
<listitem>
- <para>Make sure to remove the qt-copy module from your <link
+ <para>Make sure to remove the qt module from your <link
linkend="configure-data">configuration file</link>, as you will not need it,
and having it would add extra time to your build.</para>
</listitem>
diff --git a/doc/getting-started/configure-data.docbook b/doc/getting-started/configure-data.docbook
index cb4fb42b..e14cf784 100644
--- a/doc/getting-started/configure-data.docbook
+++ b/doc/getting-started/configure-data.docbook
@@ -43,11 +43,11 @@ destination directory that &kde; is installed to. This defaults to
<listitem><para><link linkend="conf-qtdir">qtdir</link>, which controls the
path to the installation of &Qt; to use. The default is to use a &Qt; compiled
-by &kdesrc-build;, using the special qt-copy module and the latest available
+by &kdesrc-build;, using the special qt module and the latest available
source code.
-(<filename class="directory">~/kdesrc/build/qt-copy</filename>).</para>
+(<filename class="directory">~/kdesrc/build/qt</filename>).</para>
-<note><para>This also controls where to install qt-copy.</para></note>
+<note><para>This also controls where to install qt.</para></note>
</listitem>
<listitem><para><link linkend="conf-svn-server">svn-server</link>, which
diff --git a/doc/getting-started/environment.docbook b/doc/getting-started/environment.docbook
index 6d5463b2..8cfb707c 100644
--- a/doc/getting-started/environment.docbook
+++ b/doc/getting-started/environment.docbook
@@ -20,10 +20,10 @@ samples given in this section for your particular shell.</para></important>
Open or create the <filename>.bash_profile</filename> file in the home directory with your favorite editor,
and add to the end of the file:
-If you are building the qt-copy module (you are by default), add instead:
+If you are building the qt module (you are by default), add instead:
<programlisting>
-QTDIR=(path to qtdir) # Such as ~/kdesrc/build/qt-copy by default.
+QTDIR=(path to qtdir) # Such as ~/kdesrc/build/qt by default.
KDEDIR=(path to kdedir) # Such as ~/kde by default.
KDEDIRS=$KDEDIR
PATH=$KDEDIR/bin:$QTDIR/bin:$PATH
@@ -39,7 +39,7 @@ fi
export QTDIR KDEDIRS PATH MANPATH LD_LIBRARY_PATH
</programlisting>
-or, if you are not building qt-copy (and are using your system &Qt; instead), add
+or, if you are not building qt (and are using your system &Qt; instead), add
this instead:
<programlisting>
diff --git a/doc/getting-started/kde-modules-and-selection.docbook b/doc/getting-started/kde-modules-and-selection.docbook
index 918c6159..54948cb6 100644
--- a/doc/getting-started/kde-modules-and-selection.docbook
+++ b/doc/getting-started/kde-modules-and-selection.docbook
@@ -139,7 +139,7 @@ global
<option><link linkend="conf-git-repository-base">git-repository-base</link></option> <replaceable>kde-git</replaceable> <replaceable>kde:</replaceable>
end global
-module <replaceable>qt-copy</replaceable>
+module <replaceable>qt</replaceable>
# Options removed for brevity
end module
diff --git a/doc/kdesrc-buildrc/conf-options-table.docbook b/doc/kdesrc-buildrc/conf-options-table.docbook
index 6fa99991..4bf565ad 100644
--- a/doc/kdesrc-buildrc/conf-options-table.docbook
+++ b/doc/kdesrc-buildrc/conf-options-table.docbook
@@ -49,7 +49,7 @@ for older modules of course.</para>
<entry>apply-qt-patches</entry>
<entry></entry>
<entry>This option was removed in kdesrc-build 1.10. To get the same effect,
-see <xref linkend="using-qt-copy" /> and the <link
+see <xref linkend="using-qt" /> and the <link
linkend="conf-repository">repository</link> option.</entry>
</row>
@@ -144,7 +144,7 @@ time, especially if you run &kdesrc-build; daily, or more frequently.</para>
<important><para>This feature is provided as an optimization only. Like many
other optimizations, there are trade-offs for the correctness of your
-installation. For instance, changes to the qt-copy or kdelibs modules may cause
+installation. For instance, changes to the qt or kdelibs modules may cause
a rebuild of other modules to be necessary, even if the source code doesn't
change at all.</para></important>
</entry>
@@ -167,14 +167,14 @@ operation of the &git; source control system.</para>
<row id="conf-cmake-options">
<entry>cmake-options</entry>
-<entry>Appends to global options (not applicable to qt-copy)</entry>
+<entry>Appends to global options (not applicable to qt)</entry>
<entry><para>Use this option to specify what flags to pass to &cmake; when
creating the build system for the module. When this is used as a global option,
it is applied to all modules that this script builds. When used as a module
option, it is added to the end of the global options. This allows you to
specify common &cmake; options in the global section.</para>
-<para>This option does not apply to qt-copy (which does not use &cmake;). Use
+<para>This option does not apply to qt (which does not use &cmake;). Use
<link linkend="conf-configure-flags">configure-flags</link> instead.</para>
<para>Since these options are passed directly to the &cmake; command line, they
@@ -205,7 +205,7 @@ color codes to anything but a terminal (such as xterm, &konsole;, or the normal
<entry><para>Use this option to specify what flags to pass to ./configure when
creating the build system for the module. When this is used as a global-option,
it is applied to all modules that this script builds. <emphasis>This option
-only works for qt-copy.</emphasis></para>
+only works for qt.</emphasis></para>
<para>To change configuration settings for KDE 4 modules, see
<link linkend="conf-cmake-options">cmake-options</link>.
@@ -563,8 +563,8 @@ deleted or not. The default value is <replaceable>true</replaceable>.</para>
<entry>Set this option to set the environment variable <envar>QTDIR</envar> while building.
You cannot override this setting in a module option. If you do not specify
this option, it defaults to
-<filename class="directory"><symbol>${source-dir}</symbol>/build/qt-copy</filename>,
-which uses the qt-copy module included in the &kde; source repository.
+<filename class="directory"><symbol>${source-dir}</symbol>/build/qt</filename>,
+which uses the qt module included in the &kde; source repository.
You may use a tilde (~) to represent your home directory.
</entry>
</row>
@@ -596,7 +596,7 @@ since &kdesrc-build; will be unable to perform incremental builds.</para>
<entry>Module setting overrides global</entry>
<entry><para>This option was introduced with version 1.10, and is used to
specify the &git; repository to download the source code for the module.
-&Qt; (and therefore qt-copy) would need this option, as well as various
+&Qt; (and therefore qt) would need this option, as well as various
&kde; modules that are in the process of conversion to use &git;.</para></entry>
</row>
diff --git a/doc/using-kdesrc-build/basic-features.docbook b/doc/using-kdesrc-build/basic-features.docbook
index 88edf87b..a7f20483 100644
--- a/doc/using-kdesrc-build/basic-features.docbook
+++ b/doc/using-kdesrc-build/basic-features.docbook
@@ -1,11 +1,11 @@
<sect1 id="basic-features">
<title>Basic &kdesrc-build; features</title>
-<sect2 id="using-qt-copy">
-<title>qt-copy support</title>
+<sect2 id="using-qt">
+<title>qt support</title>
<para>&kdesrc-build; supports building the &Qt; toolkit used by &kde; software
as a convenience to users. This support is handled by a special module named
-qt-copy.</para>
+qt.</para>
<note><para>&Qt; is developed under a separate repository from &kde; software
located at <ulink
@@ -15,10 +15,10 @@ url="http://qt.gitorious.org/qt">http://qt.gitorious.org/qt</ulink>.</para></not
<link linkend="conf-qtdir">qtdir</link> setting is set to the directory you'd
like to install &Qt; to, as described in <xref linkend="configure-data"/>.</para>
-<para>You should then ensure that the qt-copy module is added to
+<para>You should then ensure that the qt module is added to
your <filename>.kdesrc-buildrc</filename>, before any other modules in the
file. If you are using the sample configuration file, you can simply
-uncomment the existing qt-copy module entry.</para>
+uncomment the existing qt module entry.</para>
<para>Now you should verify the <link
linkend="conf-repository">repository</link> option and <link
@@ -30,7 +30,7 @@ on the &kde; source repositories (no other changes are applied, it is simply
a clone of the official source). This is highly recommended due to occasional
issues with cloning the full &Qt; module from its official repository.</para>
-<para>You can set the <option>repository</option> option for the qt-copy
+<para>You can set the <option>repository</option> option for the qt
module to <userinput>kde:qt</userinput> to use this option.</para>
</listitem>
diff --git a/doc/using-kdesrc-build/other-features.docbook b/doc/using-kdesrc-build/other-features.docbook
index 02f8e209..222cf837 100644
--- a/doc/using-kdesrc-build/other-features.docbook
+++ b/doc/using-kdesrc-build/other-features.docbook
@@ -71,7 +71,7 @@ if you are actually using them, at least until you are done using
<para>Also, if you already have a &Qt; installed by your distribution (and
the odds are good that you do), you probably do not need to install the
-qt-copy module. That will shave about 200 megabytes off of the on-disk source
+qt module. That will shave about 200 megabytes off of the on-disk source
size.</para>
<para>One thing to note is that due to the way &subversion; works: there are actually
More information about the kde-doc-english
mailing list