diff --git a/doc/index.docbook b/doc/index.docbook index a20d65b..cba95b1 100644 --- a/doc/index.docbook +++ b/doc/index.docbook @@ -254,7 +254,7 @@ to use the &Qt; copy, you need to do these things: - Make sure to remove the qt-copy module from your Make sure to remove the qt module from your configuration file, as you will not need it, and having it would add extra time to your build. @@ -403,11 +403,11 @@ destination directory that &kde; is installed to. This defaults to qtdir, 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. -(~/kdesrc/build/qt-copy). +(~/kdesrc/build/qt). -This also controls where to install qt-copy. +This also controls where to install qt. svn-server, which @@ -562,7 +562,7 @@ global kde-git kde: end global -module qt-copy +module qt # Options removed for brevity end module @@ -829,10 +829,10 @@ samples given in this section for your particular shell. Open or create the .bash_profile 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: -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 @@ -848,7 +848,7 @@ fi export QTDIR KDEDIRS PATH MANPATH LD_LIBRARY_PATH -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: @@ -1028,8 +1028,8 @@ including optionally applying &kde;-recommended bugfix and optimization patches to the module. For historical reasons, the &kdesrc-build; module used to build -&Qt; should be called qt-copy. See also . +&Qt; should be called qt. See also . @@ -1130,7 +1130,7 @@ a base &kde; single-user installation from the anonymous source repositories. Tilde-expansion for your configuration options. For example, you can specify: -qtdir ~/kdesrc/build/qt-copy +qtdir ~/kdesrc/build/qt @@ -1436,7 +1436,7 @@ for older modules of course. apply-qt-patches This option was removed in kdesrc-build 1.10. To get the same effect, -see and the and the repository option. @@ -1531,7 +1531,7 @@ time, especially if you run &kdesrc-build; daily, or more frequently. 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. @@ -1554,14 +1554,14 @@ operation of the &git; source control system. cmake-options -Appends to global options (not applicable to qt-copy) +Appends to global options (not applicable to qt) 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. -This option does not apply to qt-copy (which does not use &cmake;). Use +This option does not apply to qt (which does not use &cmake;). Use configure-flags instead. Since these options are passed directly to the &cmake; command line, they @@ -1592,7 +1592,7 @@ color codes to anything but a terminal (such as xterm, &konsole;, or the normal 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. This option -only works for qt-copy. +only works for qt. To change configuration settings for KDE 4 modules, see cmake-options. @@ -1950,8 +1950,8 @@ deleted or not. The default value is true. Set this option to set the environment variable QTDIR while building. You cannot override this setting in a module option. If you do not specify this option, it defaults to -${source-dir}/build/qt-copy, -which uses the qt-copy module included in the &kde; source repository. +${source-dir}/build/qt, +which uses the qt module included in the &kde; source repository. You may use a tilde (~) to represent your home directory. @@ -1983,7 +1983,7 @@ since &kdesrc-build; will be unable to perform incremental builds. Module setting overrides global 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;. @@ -2694,11 +2694,11 @@ do with this tool. Basic &kdesrc-build; features - -qt-copy support + +qt support &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. +qt. &Qt; is developed under a separate repository from &kde; software located at http://qt.gitorious.org/qt.qtdir setting is set to the directory you'd like to install &Qt; to, as described in . -You should then ensure that the qt-copy module is added to +You should then ensure that the qt module is added to your .kdesrc-buildrc, 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. +uncomment the existing qt module entry. Now you should verify the repository option and -You can set the option for the qt-copy +You can set the option for the qt module to kde:qt to use this option. @@ -3438,7 +3438,7 @@ if you are actually using them, at least until you are done using 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. One thing to note is that due to the way &subversion; works: there are actually