configure.ac | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 42e517ca2fbf3cbec7500ff0b8e0efe19d0b7adf
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Mon Aug 19 21:15:54 2024 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Aug 20 11:58:11 2024 +0200
qt/kf: Drop obsolete -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT
`QT_CLEAN_NAMESPACE` and `QT_THREAD_SUPPORT` seem to
have long been dropped from Qt (are only seen in Qt 3 changelogs
in current qtbase git dev history) and the most likely explanation
why they were still defined for the Qt based VCL plugins seems
to be that they were just copied over from the KDE 3 support
that was dropped in
commit 72699595aaa3ecb8975050b6dfc6fde437770493
Date: Wed Sep 2 14:37:23 2015 +0200
remove KDE3 support, --enable-kde and --enable-kdeab
Drop the obsolete defines for qt5, qt6, kf5 and kf6.
Change-Id: I052e5e082455150c04e57d3be2e23b6245ad940d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172062
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/configure.ac b/configure.ac
index 63785dac52f5..1de3ce8e6b99 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13503,7 +13503,7 @@ then
fi
fi
- QT5_CFLAGS="-I$qt5_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT
-DQT_NO_VERSION_TAGGING"
+ 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"
if test "$_os" = "Emscripten"; then
@@ -13632,7 +13632,7 @@ then
fi
fi
- QT6_CFLAGS="-I$qt6_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT
-DQT_NO_VERSION_TAGGING"
+ 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"
if test "$_os" = "Emscripten"; then
@@ -13745,7 +13745,7 @@ 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_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT
-DQT_NO_VERSION_TAGGING"
+ 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=$(printf '%s' "$KF5_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
@@ -13824,7 +13824,7 @@ 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_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT -DQT_NO_VERSION_TAGGING"
+ 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=$(printf '%s' "$KF6_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
