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

43 files changed, 2 insertions, 331 deletions

diff --git a/.travis.yml b/.travis.yml
index 3ff8686c..d99e32b7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ script:
   - docker pull $IMAGE
   - cid=`docker run --tty --detach --volume $TRAVIS_BUILD_DIR:/lightdm --workdir /lightdm $IMAGE bash`
   - if [ $IMAGE = "ubuntu:rolling" ]; then docker exec $cid apt-get update; fi
-  - if [ $IMAGE = "ubuntu:rolling" ]; then docker exec $cid apt-get install -y --no-install-recommends gtk-doc-tools intltool libaudit-dev libgcrypt20-dev libgirepository1.0-dev libglib2.0-dev libpam0g-dev libqt4-dev libtool libxcb1-dev libxdmcp-dev libxklavier-dev qtbase5-dev valac yelp-tools; fi
-  - if [ $IMAGE = "fedora:latest" ]; then docker exec $cid dnf install -y audit-libs-devel gcc gcc-c++ gobject-introspection-devel glib2-devel gtk-doc intltool libgcrypt-devel libtool libxcb-devel libxklavier-devel libXdmcp-devel make pam-devel qt-devel qt5-qtbase-devel redhat-rpm-config vala yelp-tools; fi
+  - if [ $IMAGE = "ubuntu:rolling" ]; then docker exec $cid apt-get install -y --no-install-recommends gtk-doc-tools intltool libaudit-dev libgcrypt20-dev libgirepository1.0-dev libglib2.0-dev libpam0g-dev libtool libxcb1-dev libxdmcp-dev libxklavier-dev qtbase5-dev valac yelp-tools; fi
+  - if [ $IMAGE = "fedora:latest" ]; then docker exec $cid dnf install -y audit-libs-devel gcc gcc-c++ gobject-introspection-devel glib2-devel gtk-doc intltool libgcrypt-devel libtool libxcb-devel libxklavier-devel libXdmcp-devel make pam-devel qt5-qtbase-devel redhat-rpm-config vala yelp-tools; fi
   - docker exec $cid ./autogen.sh --disable-silent-rules --enable-gtk-doc
   - docker exec $cid make
diff --git a/configure.ac b/configure.ac
index 462bff02..02df0367 100644
--- a/configure.ac
+++ b/configure.ac
@@ -87,40 +87,6 @@ PKG_CHECK_MODULES(LIBLIGHTDM_GOBJECT, [
     x11
 ])
 
-AC_ARG_ENABLE(liblightdm-qt,
-	AS_HELP_STRING([--enable-liblightdm-qt],[Enable LightDM client Qt4 libraries [[default=auto]]]),
-	[enable_liblightdm_qt4=$enableval],
-	[enable_liblightdm_qt4="auto"])
-compile_liblightdm_qt4=no
-if test x"$enable_liblightdm_qt4" != "xno" ; then
-    PKG_CHECK_MODULES(LIBLIGHTDM_QT4, [
-        QtCore
-        QtDBus
-        QtGui
-    ],
-    [compile_liblightdm_qt4=yes],
-    [if test "x$enable_liblightdm_qt4" != xauto; then
-        AC_MSG_FAILURE(
-          [--enable-liblightdm-qt was given, but test for Qt4 failed])
-      fi
-    ])
-
-    AC_CHECK_TOOLS(MOC4, [moc-qt4 moc])
-    if test x$MOC4 = x; then
-        compile_liblightdm_qt4=no
-        if test "x$enable_liblightdm_qt4" != xauto; then
-            AC_MSG_FAILURE(
-              [--enable-liblightdm-qt4 was given, but MOC not found])
-        fi
-    fi
-    if test x"$MOC4" = xmoc; then
-        if test x"$(readlink $(which $MOC4))" = xqtchooser; then
-            MOC4="$MOC4 --qt=4"
-        fi
-    fi
-fi
-AM_CONDITIONAL(COMPILE_LIBLIGHTDM_QT4, test x"$compile_liblightdm_qt4" != "xno")
-
 AC_ARG_ENABLE(liblightdm-qt5,
 	AS_HELP_STRING([--enable-liblightdm-qt5],[Enable LightDM client Qt5 libraries [[default=auto]]]),
 	[enable_liblightdm_qt5=$enableval],
@@ -245,7 +211,6 @@ help/Makefile
 liblightdm-gobject/liblightdm-gobject-1.pc
 liblightdm-gobject/Makefile
 liblightdm-qt/Makefile
-liblightdm-qt/liblightdm-qt-3.pc
 liblightdm-qt/liblightdm-qt5-3.pc
 po/Makefile.in
 src/Makefile
@@ -268,7 +233,6 @@ echo "
         User session:             $DEFAULT_USER_SESSION
         GObject introspection:    $found_introspection
         Vala bindings:            $enable_vala
-        liblightdm-qt:            $compile_liblightdm_qt4
         liblightdm-qt5:           $compile_liblightdm_qt5
         libaudit support:         $use_libaudit
         Enable tests:             $enable_tests
diff --git a/debian/control b/debian/control
index 350c7e85..a8626ebb 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,6 @@ Build-Depends: autoconf,
                libglib2.0-dev,
                libgtk-3-dev,
                libpam0g-dev,
-               libqt4-dev,
                libxcb1-dev,
                libxdmcp-dev,
                libxklavier-dev,
@@ -78,19 +77,6 @@ Depends: ${misc:Depends},
 Description: Typelib file for liblightdm-1
  A GObject based library for LightDM clients to use to interface with LightDM.
 
-Package: liblightdm-qt-3-0
-Section: libs
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-Recommends: lightdm
-Conflicts: liblightdm-qt-1-0 (>= 1.1.1)
-Replaces: liblightdm-qt-1-0 (>= 1.1.1)
-Description: LightDM Qt client library
- A Qt based library for LightDM clients to use to interface with LightDM.
-
 Package: liblightdm-qt5-3-0
 Section: libs
 Architecture: any
@@ -118,21 +104,6 @@ Description: LightDM GObject client library (development files)
  This package contains header files and development information, which
  is useful for building LightDM greeters and user switchers.
 
-Package: liblightdm-qt-dev
-Section: libdevel
-Architecture: any
-Multi-Arch: same
-Depends: ${misc:Depends},
-         liblightdm-qt-3-0 (= ${binary:Version}),
-         libqt4-dev,
-Breaks: liblightdm-qt-1-dev (>= 1.1.1), liblightdm-qt-3-dev
-Replaces: liblightdm-qt-1-dev (>= 1.1.1), liblightdm-qt-3-dev
-Description: LightDM Qt client library (development files)
- A Qt based library for LightDM clients to use to interface with LightDM.
- .
- This package contains header files and development information, which
- is useful for building LightDM greeters and user switchers.
-
 Package: liblightdm-qt5-3-dev
 Section: libdevel
 Architecture: any
diff --git a/debian/liblightdm-qt-3-0.install b/debian/liblightdm-qt-3-0.install
deleted file mode 100644
index 7e9811ff..00000000
--- a/debian/liblightdm-qt-3-0.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/liblightdm-qt-*.so.*
diff --git a/debian/liblightdm-qt-3-0.symbols b/debian/liblightdm-qt-3-0.symbols
deleted file mode 100644
index 8d5accdf..00000000
--- a/debian/liblightdm-qt-3-0.symbols
+++ /dev/null
@@ -1,101 +0,0 @@
-liblightdm-qt-3.so.0 liblightdm-qt-3-0 #MINVER#
- (c++|regex)"^.*::qt_metacall\(QMetaObject::Call, int, void[*][*]\)@Base$" 0
- (c++|regex)"^.*::qt_metacast\(char const[*]\)@Base$" 0
- (c++|regex)"^.*::staticMetaObject@Base$" 0
- (c++|regex)"^.*::metaObject\(\) const@Base$" 0
- (c++|regex)"^typeinfo for .*@Base$" 0
- (c++|regex)"^typeinfo name for .*@Base$" 0
- (c++|regex)"^vtable for .*@Base$" 0
- (c++|optional)"QHash<int, QByteArray>::deleteNode2(QHashData::Node*)@Base" 1.21.3
- (c++|optional)"QHash<int, QByteArray>::detach_helper()@Base" 1.21.3
- (c++|optional)"QHash<int, QByteArray>::duplicateNode(QHashData::Node*, void*)@Base" 1.21.3
- (c++|optional)"QHash<int, QByteArray>::findNode(int const&, unsigned int*) const@Base" 1.21.3
- (c++|optional)"SessionItem::~SessionItem()@Base" 1.21.3
- (c++|optional)"SessionsModelPrivate::loadSessions(QLightDM::SessionsModel::SessionType)@Base" 1.21.3
- (c++|optional)"SessionsModelPrivate::SessionsModelPrivate(QLightDM::SessionsModel*)@Base" 1.21.3
- (c++|optional)"QList<SessionItem>::detach_helper_grow(int, int)@Base" 1.21.3
- (c++|optional)"QList<SessionItem>::append(SessionItem const&)@Base" 1.21.3
- (c++|optional)"UserItem::displayName() const@Base" 1.21.3
- (c++|optional)"UserItem::~UserItem()@Base" 1.21.3
- (c++|optional)"QList<UserItem>::detach_helper(int)@Base" 1.21.3
- (c++|optional)"QList<UserItem>::detach_helper_grow(int, int)@Base" 1.21.3
- (c++|optional)"QList<UserItem>::append(UserItem const&)@Base" 1.21.3
- (c++)"QLightDM::UsersModel::UsersModel(QObject*)@Base" 1.21.3
- (c++)"QLightDM::UsersModel::~UsersModel()@Base" 1.21.3
- (c++)"QLightDM::SessionsModel::SessionsModel(QLightDM::SessionsModel::SessionType, QObject*)@Base" 1.21.3
- (c++)"QLightDM::SessionsModel::SessionsModel(QObject*)@Base" 1.21.3
- (c++)"QLightDM::SessionsModel::SessionsModel(QLightDM::SessionsModel::SessionType, QObject*)@Base" 1.21.3
- (c++)"QLightDM::SessionsModel::SessionsModel(QObject*)@Base" 1.21.3
- (c++)"QLightDM::SessionsModel::~SessionsModel()@Base" 1.21.3
- (c++)"QLightDM::GreeterPrivate::cb_showPrompt(_LightDMGreeter*, char const*, LightDMPromptType, void*)@Base" 1.21.3
- (c++)"QLightDM::GreeterPrivate::cb_showMessage(_LightDMGreeter*, char const*, LightDMMessageType, void*)@Base" 1.21.3
- (c++)"QLightDM::GreeterPrivate::cb_autoLoginExpired(_LightDMGreeter*, void*)@Base" 1.21.3
- (c++)"QLightDM::GreeterPrivate::cb_authenticationComplete(_LightDMGreeter*, void*)@Base" 1.21.3
- (c++)"QLightDM::GreeterPrivate::cb_idle(_LightDMGreeter*, void*)@Base" 1.21.3
- (c++)"QLightDM::GreeterPrivate::cb_reset(_LightDMGreeter*, void*)@Base" 1.21.3
- (c++)"QLightDM::GreeterPrivate::GreeterPrivate(QLightDM::Greeter*)@Base" 1.21.3
- (c++)"QLightDM::PowerInterface::canRestart()@Base" 1.21.3
- (c++)"QLightDM::PowerInterface::canSuspend()@Base" 1.21.3
- (c++)"QLightDM::PowerInterface::canShutdown()@Base" 1.21.3
- (c++)"QLightDM::PowerInterface::canHibernate()@Base" 1.21.3
- (c++)"QLightDM::PowerInterface::PowerInterfacePrivate::PowerInterfacePrivate()@Base" 1.21.3
- (c++)"QLightDM::PowerInterface::restart()@Base" 1.21.3
- (c++)"QLightDM::PowerInterface::suspend()@Base" 1.21.3
- (c++)"QLightDM::PowerInterface::shutdown()@Base" 1.21.3
- (c++)"QLightDM::PowerInterface::hibernate()@Base" 1.21.3
- (c++)"QLightDM::PowerInterface::PowerInterface(QObject*)@Base" 1.21.3
- (c++)"QLightDM::PowerInterface::~PowerInterface()@Base" 1.21.3
- (c++)"QLightDM::UsersModelPrivate::cb_userAdded(_LightDMUserList*, _LightDMUser*, void*)@Base" 1.21.3
- (c++)"QLightDM::UsersModelPrivate::cb_userChanged(_LightDMUserList*, _LightDMUser*, void*)@Base" 1.21.3
- (c++)"QLightDM::UsersModelPrivate::cb_userRemoved(_LightDMUserList*, _LightDMUser*, void*)@Base" 1.21.3
- (c++)"QLightDM::UsersModelPrivate::loadUsers()@Base" 1.21.3
- (c++)"QLightDM::UsersModelPrivate::UsersModelPrivate(QLightDM::UsersModel*)@Base" 1.21.3
- (c++)"QLightDM::UsersModelPrivate::~UsersModelPrivate()@Base" 1.21.3
- (c++)"QLightDM::Greeter::showPrompt(QString, QLightDM::Greeter::PromptType)@Base" 1.21.3
- (c++)"QLightDM::Greeter::connectSync()@Base" 1.21.3
- (c++)"QLightDM::Greeter::setLanguage(QString const&)@Base" 1.21.3
- (c++)"QLightDM::Greeter::showMessage(QString, QLightDM::Greeter::MessageType)@Base" 1.21.3
- (c++)"QLightDM::Greeter::authenticate(QString const&)@Base" 1.21.3
- (c++)"QLightDM::Greeter::setResettable(bool)@Base" 1.21.3
- (c++)"QLightDM::Greeter::cancelAutologin()@Base" 1.21.3
- (c++)"QLightDM::Greeter::startSessionSync(QString const&)@Base" 1.21.3
- (c++)"QLightDM::Greeter::authenticateRemote(QString const&, QString const&)@Base" 1.21.3
- (c++)"QLightDM::Greeter::authenticateAsGuest()@Base" 1.21.3
- (c++)"QLightDM::Greeter::connectToDaemonSync()@Base" 1.21.3
- (c++)"QLightDM::Greeter::cancelAuthentication()@Base" 1.21.3
- (c++)"QLightDM::Greeter::authenticateAutologin()@Base" 1.21.3
- (c++)"QLightDM::Greeter::autologinTimerExpired()@Base" 1.21.3
- (c++)"QLightDM::Greeter::authenticationComplete()@Base" 1.21.3
- (c++)"QLightDM::Greeter::ensureSharedDataDirSync(QString const&)@Base" 1.21.3
- (c++)"QLightDM::Greeter::idle()@Base" 1.21.3
- (c++)"QLightDM::Greeter::reset()@Base" 1.21.3
- (c++)"QLightDM::Greeter::respond(QString const&)@Base" 1.21.3
- (c++)"QLightDM::Greeter::Greeter(QObject*)@Base" 1.21.3
- (c++)"QLightDM::Greeter::~Greeter()@Base" 1.21.3
- (c++)"QLightDM::UsersModel::data(QModelIndex const&, int) const@Base" 1.21.3
- (c++)"QLightDM::UsersModel::rowCount(QModelIndex const&) const@Base" 1.21.3
- (c++)"QLightDM::SessionsModel::data(QModelIndex const&, int) const@Base" 1.21.3
- (c++)"QLightDM::SessionsModel::rowCount(QModelIndex const&) const@Base" 1.21.3
- (c++)"QLightDM::Greeter::osVersionId() const@Base" 1.21.3
- (c++)"QLightDM::Greeter::osPrettyName() const@Base" 1.21.3
- (c++)"QLightDM::Greeter::hideUsersHint() const@Base" 1.21.3
- (c++)"QLightDM::Greeter::selectUserHint() const@Base" 1.21.3
- (c++)"QLightDM::Greeter::isAuthenticated() const@Base" 1.21.3
- (c++)"QLightDM::Greeter::selectGuestHint() const@Base" 1.21.3
- (c++)"QLightDM::Greeter::inAuthentication() const@Base" 1.21.3
- (c++)"QLightDM::Greeter::autologinSessionHint() const@Base" 1.25.0
- (c++)"QLightDM::Greeter::autologinUserHint() const@Base" 1.21.3
- (c++)"QLightDM::Greeter::authenticationUser() const@Base" 1.21.3
- (c++)"QLightDM::Greeter::autologinGuestHint() const@Base" 1.21.3
- (c++)"QLightDM::Greeter::defaultSessionHint() const@Base" 1.21.3
- (c++)"QLightDM::Greeter::hasGuestAccountHint() const@Base" 1.21.3
- (c++)"QLightDM::Greeter::showManualLoginHint() const@Base" 1.21.3
- (c++)"QLightDM::Greeter::showRemoteLoginHint() const@Base" 1.21.3
- (c++)"QLightDM::Greeter::autologinTimeoutHint() const@Base" 1.21.3
- (c++)"QLightDM::Greeter::motd() const@Base" 1.21.3
- (c++)"QLightDM::Greeter::osId() const@Base" 1.21.3
- (c++)"QLightDM::Greeter::osName() const@Base" 1.21.3
- (c++)"QLightDM::Greeter::getHint(QString const&) const@Base" 1.21.3
- (c++)"QLightDM::Greeter::hostname() const@Base" 1.21.3
- (c++)"QLightDM::Greeter::lockHint() const@Base" 1.21.3
- (c++)"QLightDM::Greeter::osVersion() const@Base" 1.21.3
diff --git a/debian/liblightdm-qt-dev.install b/debian/liblightdm-qt-dev.install
deleted file mode 100644
index a32f22b0..00000000
--- a/debian/liblightdm-qt-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/include/lightdm-qt-*
-usr/lib/*/pkgconfig/liblightdm-qt-*.pc
-usr/lib/*/liblightdm-qt-*.so
diff --git a/liblightdm-qt/Makefile.am b/liblightdm-qt/Makefile.am
index 2bf17f29..aa9630a7 100644
--- a/liblightdm-qt/Makefile.am
+++ b/liblightdm-qt/Makefile.am
@@ -1,9 +1,6 @@
 common_libadd = \
 	-L$(top_builddir)/liblightdm-gobject \
 	-llightdm-gobject-1
-liblightdm_qt_3_la_LIBADD = \
-	$(LIBLIGHTDM_QT4_LIBS) \
-	$(common_libadd)
 liblightdm_qt5_3_la_LIBADD = \
 	$(LIBLIGHTDM_QT5_LIBS) \
 	$(common_libadd)
@@ -13,9 +10,6 @@ common_cflags = \
 	-I$(top_srcdir)/liblightdm-gobject \
 	$(GLIB_CFLAGS) \
 	-DQT_NO_KEYWORDS
-liblightdm_qt_3_la_CXXFLAGS = \
-	$(LIBLIGHTDM_QT4_CFLAGS) \
-	$(common_cflags)
 liblightdm_qt5_3_la_CXXFLAGS = \
 	-fPIC \
 	-DQT_DISABLE_DEPRECATED_BEFORE="QT_VERSION_CHECK(4, 0, 0)" \
@@ -32,7 +26,6 @@ common_headers = \
 	QLightDM/sessionsmodel.h \
 	QLightDM/usersmodel.h
 
-liblightdm_qt_3includedir=$(includedir)/lightdm-qt-3/QLightDM
 liblightdm_qt5_3includedir=$(includedir)/lightdm-qt5-3/QLightDM
 
 common_sources = \
@@ -59,13 +52,6 @@ lib_LTLIBRARIES =
 BUILT_SOURCES =
 pkgconfig_DATA =
 
-if COMPILE_LIBLIGHTDM_QT4
-lib_LTLIBRARIES += liblightdm-qt-3.la
-liblightdm_qt_3include_HEADERS = $(common_headers)
-BUILT_SOURCES += $(common_sources:.cpp=_moc4.cpp)
-pkgconfig_DATA += liblightdm-qt-3.pc
-endif
-
 if COMPILE_LIBLIGHTDM_QT5
 lib_LTLIBRARIES += liblightdm-qt5-3.la
 liblightdm_qt5_3include_HEADERS = $(common_headers)
@@ -74,12 +60,6 @@ pkgconfig_DATA += liblightdm-qt5-3.pc
 endif
 
 # 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/liblightdm-qt/liblightdm-qt-3.pc.in b/liblightdm-qt/liblightdm-qt-3.pc.in
deleted file mode 100644
index 28f2f334..00000000
--- a/liblightdm-qt/liblightdm-qt-3.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: liblightdm-qt
-Description: LightDM Qt4 client library
-Version: @VERSION@
-Requires: QtCore QtGui
-Libs: -L${libdir} -llightdm-qt-3
-Cflags: -I${includedir}/lightdm-qt-3
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