Git commit 2a2f6fd7a956a3657908b91dfe074c544e954e74 by Andrew Shark.
Committed on 17/01/2024 at 17:57.
Pushed by ashark into branch 'master'.
Rename qtdir option to qt-install-dir
Also remove usage of ancient environment variable QTDIR, which is not used
today.
CC: #142
M +1-1completions/zsh/_kdesrc-build
M +2-2data/build-include/qt5.ksb
M +2-2data/build-include/qt6.ksb
M +1-1data/kde-env-master.sh.in
M +1-1data/kdesrc-buildrc.in
M +6-7doc/appendix-profile.docbook
M +1-6doc/basic-features.docbook
M +7-7doc/conf-options-table.docbook
M +2-2doc/features.docbook
M +0-1doc/index.docbook
M +1-1doc/kdesrc-buildrc.docbook
M +5-2modules/ksb/Application.pm
M +1-1modules/ksb/BuildContext.pm
M +8-10 modules/ksb/BuildSystem/KDECMake.pm
M +3-3modules/ksb/BuildSystem/Qt4.pm
M +5-5modules/ksb/BuildSystem/Qt5.pm
M +1-1modules/ksb/BuildSystem/Qt6.pm
M +3-3modules/ksb/Module.pm
M +1-1t/data/bug-395627/kdesrc-buildrc
M +4-4t/unit/build-environment/platform-env-prepend.t
M +1-1vim/syntax/kdesrc-buildrc.vim
https://invent.kde.org/sdk/kdesrc-build/-/commit/2a2f6fd7a956a3657908b91dfe074c544e954e74
diff --git a/completions/zsh/_kdesrc-build b/completions/zsh/_kdesrc-build
index 3741e76f..8260529f 100644
--- a/completions/zsh/_kdesrc-build
+++ b/completions/zsh/_kdesrc-build
@@ -64,7 +64,7 @@ _arguments \
"--print-modules" \
"(--purge-old-logs
--no-purge-old-logs)"{--purge-old-logs,--no-purge-old-logs} \
"--qmake-options"":argument:" \
- "--qtdir"":argument:" \
+ "--qt-install-dir"":argument:" \
"--query"":argument:" \
"--rc-file"":::_files" \
"--rebuild-failures" \
diff --git a/data/build-include/qt5.ksb b/data/build-include/qt5.ksb
index 7dee09f2..d64b3da6 100644
--- a/data/build-include/qt5.ksb
+++ b/data/build-include/qt5.ksb
@@ -14,8 +14,8 @@ module-set qt5-set
# you cannot get it to compile by uncommenting the next line.
# ignore-modules qtwebengine
-# install path. This *MUST* match your qtdir setting in kdesrc-buildrc!
-install-dir ${qtdir}
+# install path. This *MUST* match your qt-install-dir setting in
kdesrc-buildrc!
+install-dir ${qt-install-dir}
configure-flags -release -reduce-relocations -force-debug-info
-separate-debug-info -skip qtdocgallery
diff --git a/data/build-include/qt6.ksb b/data/build-include/qt6.ksb
index 4259b401..26c7384d 100644
--- a/data/build-include/qt6.ksb
+++ b/data/build-include/qt6.ksb
@@ -9,8 +9,8 @@ module-set qt6-set
repository qt6-copy # as defined in kdesrc-buildrc-kf6-sample
branch 6.6
-# install path. This *MUST* match your qtdir setting in kdesrc-buildrc!
-install-dir ${qtdir}
+# install path. This *MUST* match your qt-install-dir setting in
kdesrc-buildrc!
+install-dir ${qt-install-dir}
# These have been manually placed in dependency order based on the
# .gitmodules file in https://code.qt.io/cgit/qt/qt5.git/tree/.gitmodules
diff --git a/data/kde-env-master.sh.in b/data/kde-env-master.sh.in
index df107888..70e8452e 100644
--- a/data/kde-env-master.sh.in
+++ b/data/kde-env-master.sh.in
@@ -32,7 +32,7 @@ kde_prefix="<% install-dir %>" # E.g. "$HOME/kf5"
# Where Qt is installed to. If using the system Qt, leave blank and this script
# will try to auto-detect.
-qt_prefix="<% qtdir %>"# E.g. "$HOME/qt5" or "/usr" on many systems.
+qt_prefix="<% qt-install-dir %>"# E.g. "$HOME/qt5" or "/usr" on many
systems.
else # kdesrc-build:
filter
kde_prefix="$HOME/kf5" # kdesrc-build:
filter
qt_prefix="$HOME/qt5" # kdesrc-build:
filter
diff --git a/data/kdesrc-buildrc.in b/data/kdesrc-buildrc.in
index 62de3d1a..771d5aa9 100644
--- a/data/kdesrc-buildrc.in
+++ b/data/kdesrc-buildrc.in
@@ -21,7 +21,7 @@ global
# relative to source-dir by default
build-dir %{build-dir}
-# qtdir ~/kde/qt # Where to install Qt6 if kdesrc-build supplies it
+# qt-install-dir ~/kde/qt # Where to install Qt6 if kdesrc-build supplies
it
cmake-options -DCMAKE_BUILD_TYPE=RelWithDebInfo
diff --git a/doc/appendix-profile.docbook b/doc/appendix-profile.docbook
index a9293a92..517465fc 100644
--- a/doc/appendix-profile.docbook
+++ b/doc/appendix-profile.docbook
@@ -28,25 +28,24 @@ and add to the end of the file:
If you are building the qt module (you are by default), add instead:
-QTDIR=(path to qtdir) # Such as ~/kdesrc/build/qt by default.
-PATH=${install-dir}/bin:$QTDIR/bin:$PATH
-MANPATH=$QTDIR/doc/man:$MANPATH
+PATH=${install-dir}/bin:${qt-install-dir}/bin:$PATH
+MANPATH=${qt-install-dir}/doc/man:$MANPATH
# Act appropriately if LD_LIBRARY_PATH is not already set.
if [ -z $LD_LIBRARY_PATH ]; then
-
