configure.ac | 4 ----
1 file changed, 4 deletions(-)
New commits:
commit e49f4e17b162c72875a73e5ec85babb1fd5a1ef7
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Mon Feb 5 09:42:15 2024 +0100
Commit: Stephan Bergmann <stephan.bergm...@allotropia.de>
CommitDate: Mon Feb 5 11:50:16 2024 +0100
Allow qmake, moc to be explicitly set in autogen.input
(I need that for a wasm cross-build with Qt6, where MOC6 needs to
explicitly be
set to the build-time moc tool, not a non-existing anyway host moc tool.)
Change-Id: I4a779ccc1b12b80a2e67bbaa5cd7ec04861a5d43
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162984
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
diff --git a/configure.ac b/configure.ac
index 3387786c2f89..44f626618d6e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13080,8 +13080,6 @@ dnl
===================================================================
QT5_CFLAGS=""
QT5_LIBS=""
-QMAKE5="qmake"
-MOC5="moc"
QT5_GOBJECT_CFLAGS=""
QT5_GOBJECT_LIBS=""
QT5_HAVE_GOBJECT=""
@@ -13235,8 +13233,6 @@ dnl
===================================================================
QT6_CFLAGS=""
QT6_LIBS=""
-QMAKE6="qmake"
-MOC6="moc"
QT6_PLATFORMS_SRCDIR=""
if test \( "$test_kf6" = "yes" -a "$ENABLE_KF6" = "TRUE" \) -o \
\( "$test_qt6" = "yes" -a "$ENABLE_QT6" = "TRUE" \)
