Drop Qt 4 support, it's been unsupported since 2015

35 files changed, 0 insertions, 128 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6ca26678..a1d292df 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -297,42 +297,6 @@ TESTS += \
 	test-login-remote-session-python \
 	test-power-python
 
-if COMPILE_LIBLIGHTDM_QT4
-TESTS += \
-	test-autologin-timeout-qt4 \
-	test-autologin-guest-timeout-qt4 \
-	test-autologin-session-timeout-qt4 \
-	test-cancel-authentication-qt4 \
-	test-login-qt4 \
-	test-login-manual-qt4 \
-	test-login-manual-previous-session-qt4 \
-	test-login-no-password-qt4 \
-	test-login-long-username-qt4 \
-	test-login-long-password-qt4 \
-	test-login-two-factor-qt4 \
-	test-login-new-authtok-qt4 \
-	test-login-info-prompt-qt4 \
-	test-login-multi-info-prompt-qt4 \
-	test-login-previous-session-qt4 \
-	test-login-wrong-password-qt4 \
-	test-login-invalid-user-qt4 \
-	test-login-invalid-session-qt4 \
-	test-login-logout-qt4 \
-	test-login-pick-session-qt4 \
-	test-login-remember-session-qt4 \
-	test-login-manual-remember-session-qt4 \
-	test-login-guest-qt4 \
-	test-login-guest-pick-session-qt4 \
-	test-login-guest-disabled-qt4 \
-	test-login-guest-no-setup-script-qt4 \
-	test-login-guest-fail-setup-script-qt4 \
-	test-login-guest-logout-qt4 \
-	test-login-remote-session-qt4 \
-	test-sessions-qt4 \
-	test-users-qt4 \
-	test-power-qt4
-endif
-
 if COMPILE_LIBLIGHTDM_QT5
 TESTS += \
 	test-autologin-timeout-qt5 \
@@ -377,7 +341,6 @@ EXTRA_DIST = \
 	data/greeters/test-gobject-greeter.desktop \
 	data/greeters/test-mir-greeter.desktop \
 	data/greeters/test-python-greeter.desktop \
-	data/greeters/test-qt4-greeter.desktop \
 	data/greeters/test-qt5-greeter.desktop \
 	data/greeters/test-wayland-greeter.desktop \
 	data/keys.conf \
diff --git a/tests/data/greeters/test-qt4-greeter.desktop b/tests/data/greeters/test-qt4-greeter.desktop
deleted file mode 100644
index ec8a6508..00000000
--- a/tests/data/greeters/test-qt4-greeter.desktop
+++ /dev/null
@@ -1,4 +0,0 @@
-[Desktop Entry]
-Name=Test Qt4 Greeter
-Comment=LightDM test Qt4 greeter
-Exec=test-qt4-greeter
diff --git a/tests/src/Makefile.am b/tests/src/Makefile.am
index 596e841a..179f08da 100644
--- a/tests/src/Makefile.am
+++ b/tests/src/Makefile.am
@@ -32,10 +32,6 @@ libsystem_la_LIBADD = -ldl $(GLIB_LIBS) $(GIO_UNIX_LIBS)
 # but produces a shared library (instead of just a static library)
 libsystem_la_LDFLAGS = -rpath /nowhere
 
-if COMPILE_LIBLIGHTDM_QT4
-noinst_PROGRAMS += test-qt4-greeter
-endif
-
 if COMPILE_LIBLIGHTDM_QT5
 noinst_PROGRAMS += test-qt5-greeter
 endif
@@ -137,30 +133,22 @@ test_script_hook_LDADD = \
 	$(GLIB_LIBS) \
 	$(GIO_UNIX_LIBS)
 
-test-qt4-greeter_moc4.cpp: test-qt-greeter.h
-	$(am__v_MOC4_$(V)) $(MOC4) $< -o $@
 test-qt5-greeter_moc5.cpp: test-qt-greeter.h
 	$(am__v_MOC5_$(V)) $(MOC5) $< -o $@
 common_qt_sources = test-qt-greeter.cpp test-qt-greeter.h status.c status.h
-test_qt4_greeter_SOURCES = $(common_qt_sources)
 test_qt5_greeter_SOURCES = $(common_qt_sources)
-nodist_test_qt4_greeter_SOURCES = test-qt4-greeter_moc4.cpp
 nodist_test_qt5_greeter_SOURCES = test-qt5-greeter_moc5.cpp
 common_qt_cflags = \
 	$(WARN_CXXFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(GIO_UNIX_CFLAGS) \
 	$(XCB_CFLAGS)
-test_qt4_greeter_CFLAGS = $(common_qt_cflags)
 test_qt5_greeter_CFLAGS = $(common_qt_cflags)
 common_qt_cxxflags = \
 	-fPIC \
 	-DQT_DISABLE_DEPRECATED_BEFORE="QT_VERSION_CHECK(4, 0, 0)" \
 	-I$(top_srcdir)/liblightdm-qt \
 	$(GLIB_CFLAGS)
-test_qt4_greeter_CXXFLAGS = \
-	$(common_qt_cxxflags) \
-	$(LIBLIGHTDM_QT4_CFLAGS)
 test_qt5_greeter_CXXFLAGS = \
 	$(common_qt_cxxflags) \
 	$(LIBLIGHTDM_QT5_CFLAGS)
@@ -171,10 +159,6 @@ common_qt_ldadd = \
 	$(GLIB_LIBS) \
 	$(GIO_UNIX_LIBS) \
 	$(XCB_LIBS)
-test_qt4_greeter_LDADD = \
-	$(common_qt_ldadd) \
-	-llightdm-qt-3 \
-	$(LIBLIGHTDM_QT4_LIBS)
 test_qt5_greeter_LDADD = \
 	$(common_qt_ldadd) \
 	-llightdm-qt5-3 \
@@ -224,16 +208,9 @@ vnc_client_LDADD = \
 	$(GIO_UNIX_LIBS)
 
 CLEANFILES = \
-	test-qt4-greeter_moc4.cpp \
 	test-qt5-greeter_moc5.cpp
 
 # Support pretty printing MOC
-AM_V_MOC4 = $(am__v_MOC4_$(V))
-am__v_MOC4_ = $(am__v_MOC4_$(AM_DEFAULT_VERBOSITY))
-am__v_MOC4_0 = @echo "  MOC4    " $@;
-%_moc4.cpp: QLightDM/%.h
-	$(AM_V_MOC4) $(MOC4) $< -o $@
-
 AM_V_MOC5 = $(am__v_MOC5_$(V))
 am__v_MOC5_ = $(am__v_MOC5_$(AM_DEFAULT_VERBOSITY))
 am__v_MOC5_0 = @echo "  MOC5    " $@;
diff --git a/tests/test-autologin-guest-timeout-qt4 b/tests/test-autologin-guest-timeout-qt4
deleted file mode 100755
index 07657c0e..00000000
--- a/tests/test-autologin-guest-timeout-qt4
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner autologin-guest-timeout test-qt4-greeter
diff --git a/tests/test-autologin-session-timeout-qt4 b/tests/test-autologin-session-timeout-qt4
deleted file mode 100755
index f790255e..00000000
--- a/tests/test-autologin-session-timeout-qt4
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner autologin-session-timeout test-qt4-greeter
diff --git a/tests/test-autologin-timeout-qt4 b/tests/test-autologin-timeout-qt4
deleted file mode 100755
index 3b928c48..00000000
--- a/tests/test-autologin-timeout-qt4
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner autologin-timeout test-qt4-greeter
diff --git a/tests/test-cancel-authentication-qt4 b/tests/test-cancel-authentication-qt4
deleted file mode 100755
index 298c0af9..00000000
--- a/tests/test-cancel-authentication-qt4
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner cancel-authentication test-qt4-greeter
diff --git a/tests/test-login-guest-disabled-qt4 b/tests/test-login-guest-disabled-qt4
deleted file mode 100755
index b7931654..00000000
--- a/tests/test-login-guest-disabled-qt4
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner login-guest-disabled test-qt4-greeter
diff --git a/tests/test-login-guest-fail-setup-script-qt4 b/tests/test-login-guest-fail-setup-script-qt4
deleted file mode 100755
index a80ca9ac..00000000
--- a/tests/test-login-guest-fail-setup-script-qt4
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner login-guest-fail-setup-script test-qt4-greeter
diff --git a/tests/test-login-guest-logout-qt4 b/tests/test-login-guest-logout-qt4
deleted file mode 100755
index be3724fc..00000000
--- a/tests/test-login-guest-logout-qt4
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner login-guest-logout test-qt4-greeter
diff --git a/tests/test-login-guest-no-setup-script-qt4 b/tests/test-login-guest-no-setup-script-qt4
deleted file mode 100755
index 5a068c8c..00000000
--- a/tests/test-login-guest-no-setup-script-qt4
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner login-guest-no-setup-script test-qt4-greeter
diff --git a/tests/test-login-guest-pick-session-qt4 b/tests/test-login-guest-pick-session-qt4
deleted file mode 100755
index 574f6105..00000000
--- a/tests/test-login-guest-pick-session-qt4
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner login-guest-pick-session test-qt4-greeter
diff --git a/tests/test-login-guest-qt4 b/tests/test-login-guest-qt4
deleted file mode 100755
index f7ccc487..00000000
--- a/tests/test-login-guest-qt4
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner login-guest test-qt4-greeter
diff --git a/tests/test-login-info-prompt-qt4 b/tests/test-login-info-prompt-qt4
deleted file mode 100755
index 8c212bca..00000000
--- a/tests/test-login-info-prompt-qt4
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner login-info-prompt test-qt4-greeter
diff --git a/tests/test-login-invalid-session-qt4 b/tests/test-login-invalid-session-qt4
deleted file mode 100755
index 9fb97bc3..00000000
--- a/tests/test-login-invalid-session-qt4
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner login-invalid-session test-qt4-greeter
diff --git a/tests/test-login-invalid-user-qt4 b/tests/test-login-invalid-user-qt4
deleted file mode 100755
index ab855abc..00000000
--- a/tests/test-login-invalid-user-qt4
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner login-invalid-user test-qt4-greeter
diff --git a/tests/test-login-logout-qt4 b/tests/test-login-logout-qt4
deleted file mode 100755
index 010863e5..00000000
--- a/tests/test-login-logout-qt4
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner login-logout test-qt4-greeter
diff --git a/tests/test-login-long-password-qt4 b/tests/test-login-long-password-qt4
deleted file mode 100755
index e55f88bc..00000000
--- a/tests/test-login-long-password-qt4
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner login-long-password test-qt4-greeter
diff --git a/tests/test-login-long-username-qt4 b/tests/test-login-long-username-qt4
deleted file mode 100755
index 0a294ef4..00000000
--- a/tests/test-login-long-username-qt4
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner login-long-username test-qt4-greeter
diff --git a/tests/test-login-manual-previous-session-qt4 b/tests/test-login-manual-previous-session-qt4
deleted file mode 100755
index c485520e..00000000
--- a/tests/test-login-manual-previous-session-qt4
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner login-manual-previous-session test-qt4-greeter
diff --git a/tests/test-login-manual-qt4 b/tests/test-login-manual-qt4
deleted file mode 100755
index bd341af8..00000000
--- a/tests/test-login-manual-qt4
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner login-manual test-qt4-greeter
diff --git a/tests/test-login-manual-remember-session-qt4 b/tests/test-login-manual-remember-session-qt4
deleted file mode 100755
index 9cb137b8..00000000
--- a/tests/test-login-manual-remember-session-qt4
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner login-manual-remember-session test-qt4-greeter
diff --git a/tests/test-login-multi-info-prompt-qt4 b/tests/test-login-multi-info-prompt-qt4
deleted file mode 100755
index b308a9d5..00000000
--- a/tests/test-login-multi-info-prompt-qt4
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner login-multi-info-prompt test-qt4-greeter
diff --git a/tests/test-login-new-authtok-qt4 b/tests/test-login-new-authtok-qt4
deleted file mode 100755
index 35e8bb47..00000000
--- a/tests/test-login-new-authtok-qt4
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner login-new-authtok test-qt4-greeter
diff --git a/tests/test-login-no-password-qt4 b/tests/test-login-no-password-qt4
deleted file mode 100755
index 62e3ccc7..00000000
--- a/tests/test-login-no-password-qt4
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner login-no-password test-qt4-greeter
diff --git a/tests/test-login-pick-session-qt4 b/tests/test-login-pick-session-qt4
deleted file mode 100755
index fb3a286b..00000000
--- a/tests/test-login-pick-session-qt4
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner login-pick-session test-qt4-greeter
diff --git a/tests/test-login-previous-session-qt4 b/tests/test-login-previous-session-qt4
deleted file mode 100755
index 7ec67f0d..00000000
--- a/tests/test-login-previous-session-qt4
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner login-previous-session test-qt4-greeter
diff --git a/tests/test-login-qt4 b/tests/test-login-qt4
deleted file mode 100755
index 8ce496a5..00000000
--- a/tests/test-login-qt4
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner login test-qt4-greeter
diff --git a/tests/test-login-remember-session-qt4 b/tests/test-login-remember-session-qt4
deleted file mode 100755
index d63fb911..00000000
--- a/tests/test-login-remember-session-qt4
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner login-remember-session test-qt4-greeter
diff --git a/tests/test-login-remote-session-qt4 b/tests/test-login-remote-session-qt4
deleted file mode 100755
index dc0d56ed..00000000
--- a/tests/test-login-remote-session-qt4
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner login-remote-session test-qt4-greeter
diff --git a/tests/test-login-two-factor-qt4 b/tests/test-login-two-factor-qt4
deleted file mode 100755
index 3897f8a0..00000000
--- a/tests/test-login-two-factor-qt4
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner login-two-factor test-qt4-greeter
diff --git a/tests/test-login-wrong-password-qt4 b/tests/test-login-wrong-password-qt4
deleted file mode 100755
index cbbee043..00000000
--- a/tests/test-login-wrong-password-qt4
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner login-wrong-password test-qt4-greeter
diff --git a/tests/test-power-qt4 b/tests/test-power-qt4
deleted file mode 100755
index 11d7cb2b..00000000
--- a/tests/test-power-qt4
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner power test-qt4-greeter
diff --git a/tests/test-sessions-qt4 b/tests/test-sessions-qt4
deleted file mode 100755
index db339f87..00000000
--- a/tests/test-sessions-qt4
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner sessions test-qt4-greeter
diff --git a/tests/test-users-qt4 b/tests/test-users-qt4
deleted file mode 100755
index 4899ffc7..00000000
--- a/tests/test-users-qt4
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner users test-qt4-greeter