configure.ac | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 013ea821a5fac77bf0e0361d9d63dbcb54c8a42c
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu May 15 18:43:24 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu May 15 22:03:49 2025 +0200
qt, configure: Drop QtNetwork
It's unused, so drop it.
Thanks to Andreas Sturmlechner for mentioning it
on IRC.
Change-Id: I28817fc0bd4bc91d8249c8fea5358bfcb6a61286
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185370
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/configure.ac b/configure.ac
index fa74086d7105..f8e10df3acb9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13840,7 +13840,7 @@ then
QT5_CFLAGS="-I$qt5_incdir -DQT_NO_VERSION_TAGGING"
QT5_CFLAGS=$(printf '%s' "$QT5_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
- QT5_LIBS="-L$qt5_libdir -lQt5Core -lQt5Gui -lQt5Widgets -lQt5Network"
+ QT5_LIBS="-L$qt5_libdir -lQt5Core -lQt5Gui -lQt5Widgets"
if test "$_os" = "Emscripten"; then
QT5_LIBS="$QT5_LIBS -lqtpcre2 -lQt5EventDispatcherSupport
-lQt5FontDatabaseSupport -L${qt5_platformsdir} -lqwasm"
fi
@@ -13969,7 +13969,7 @@ then
QT6_CFLAGS="-I$qt6_incdir -DQT_NO_VERSION_TAGGING"
QT6_CFLAGS=$(printf '%s' "$QT6_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
- QT6_LIBS="-L$qt6_libdir -lQt6Core -lQt6Gui -lQt6Widgets -lQt6Network"
+ QT6_LIBS="-L$qt6_libdir -lQt6Core -lQt6Gui -lQt6Widgets"
if test "$_os" = "Emscripten"; then
QT6_LIBS="$QT6_LIBS -lQt6BundledPcre2 -lQt6BundledZLIB
-L${qt6_platformsdir} -lqwasm -sGL_ENABLE_GET_PROC_ADDRESS"
else
@@ -14080,8 +14080,8 @@ then
AC_MSG_ERROR([KF5 libraries not found. Please specify the root of
your KF5 installation by exporting KF5DIR before running "configure".])
fi
- KF5_CFLAGS="-I$kf5_incdir -I$kf5_incdir/KCoreAddons -I$kf5_incdir/KI18n
-I$kf5_incdir/KConfigCore -I$kf5_incdir/KWindowSystem -I$kf5_incdir/KIOCore
-I$kf5_incdir/KIOWidgets -I$kf5_incdir/KIOFileWidgets -I$qt5_incdir
-I$qt5_incdir/QtCore -I$qt5_incdir/QtGui -I$qt5_incdir/QtWidgets
-I$qt5_incdir/QtNetwork -DQT_NO_VERSION_TAGGING"
- KF5_LIBS="-L$kf5_libdir -lKF5CoreAddons -lKF5I18n -lKF5ConfigCore
-lKF5WindowSystem -lKF5KIOCore -lKF5KIOWidgets -lKF5KIOFileWidgets
-L$qt5_libdir -lQt5Core -lQt5Gui -lQt5Widgets -lQt5Network"
+ KF5_CFLAGS="-I$kf5_incdir -I$kf5_incdir/KCoreAddons -I$kf5_incdir/KI18n
-I$kf5_incdir/KConfigCore -I$kf5_incdir/KWindowSystem -I$kf5_incdir/KIOCore
-I$kf5_incdir/KIOWidgets -I$kf5_incdir/KIOFileWidgets -I$qt5_incdir
-I$qt5_incdir/QtCore -I$qt5_incdir/QtGui -I$qt5_incdir/QtWidgets
-DQT_NO_VERSION_TAGGING"
+ KF5_LIBS="-L$kf5_libdir -lKF5CoreAddons -lKF5I18n -lKF5ConfigCore
-lKF5WindowSystem -lKF5KIOCore -lKF5KIOWidgets -lKF5KIOFileWidgets
-L$qt5_libdir -lQt5Core -lQt5Gui -lQt5Widgets"
KF5_CFLAGS=$(printf '%s' "$KF5_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
if test "$USING_X11" = TRUE; then
@@ -14159,8 +14159,8 @@ then
AC_MSG_ERROR([KF6 libraries not found. Please specify the root of
your KF6 installation by exporting KF6DIR before running "configure".])
fi
- KF6_CFLAGS="-I$kf6_incdir -I$kf6_incdir/KCoreAddons -I$kf6_incdir/KI18n
-I$kf6_incdir/KConfig -I$kf6_incdir/KConfigCore -I$kf6_incdir/KWindowSystem
-I$kf6_incdir/KIO -I$kf6_incdir/KIOCore -I$kf6_incdir/KIOWidgets
-I$kf6_incdir/KIOFileWidgets -I$qt6_incdir -I$qt6_incdir/QtCore
-I$qt6_incdir/QtGui -I$qt6_incdir/QtWidgets -I$qt6_incdir/QtNetwork
-DQT_NO_VERSION_TAGGING"
- KF6_LIBS="-L$kf6_libdir -lKF6CoreAddons -lKF6I18n -lKF6ConfigCore
-lKF6WindowSystem -lKF6KIOCore -lKF6KIOWidgets -lKF6KIOFileWidgets
-L$qt6_libdir -lQt6Core -lQt6Gui -lQt6Widgets -lQt6Network"
+ KF6_CFLAGS="-I$kf6_incdir -I$kf6_incdir/KCoreAddons -I$kf6_incdir/KI18n
-I$kf6_incdir/KConfig -I$kf6_incdir/KConfigCore -I$kf6_incdir/KWindowSystem
-I$kf6_incdir/KIO -I$kf6_incdir/KIOCore -I$kf6_incdir/KIOWidgets
-I$kf6_incdir/KIOFileWidgets -I$qt6_incdir -I$qt6_incdir/QtCore
-I$qt6_incdir/QtGui -I$qt6_incdir/QtWidgets -DQT_NO_VERSION_TAGGING"
+ KF6_LIBS="-L$kf6_libdir -lKF6CoreAddons -lKF6I18n -lKF6ConfigCore
-lKF6WindowSystem -lKF6KIOCore -lKF6KIOWidgets -lKF6KIOFileWidgets
-L$qt6_libdir -lQt6Core -lQt6Gui -lQt6Widgets"
KF6_CFLAGS=$(printf '%s' "$KF6_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
AC_LANG_PUSH([C++])
