From 9e8ebce2bdbddb76aa0db14e8ab57a3aa0580d3f Mon Sep 17 00:00:00 2001
From: Georg Baum <baum@lyx.org>
Date: Mon, 23 Mar 2015 21:23:03 +0100
Subject: [PATCH] Fix compilation of tests

support/filetools.cpp requires the qt GUI libs since d00dcc2ca7b.
---
 src/Makefile.am         |  8 ++++----
 src/support/Makefile.am | 14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 6df58588d9..9b863cdf12 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -724,8 +724,8 @@ ADD_FRAMEWORKS = -framework QtGui -framework QtCore -framework AppKit -framework
 endif
 
 check_layout_CPPFLAGS = $(AM_CPPFLAGS)
-check_layout_LDADD = support/liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) @LIBS@ $(QT_CORE_LIBS) $(LIBSHLWAPI)
-check_layout_LDFLAGS = $(QT_CORE_LDFLAGS) $(ADD_FRAMEWORKS)
+check_layout_LDADD = support/liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) @LIBS@ $(QT_LIB) $(LIBSHLWAPI)
+check_layout_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS)
 check_layout_SOURCES = \
 	insets/InsetLayout.cpp \
 	Color.cpp \
@@ -744,8 +744,8 @@ check_layout_SOURCES = \
 	tests/dummy_functions.cpp
 
 check_ExternalTransforms_CPPFLAGS = $(AM_CPPFLAGS)
-check_ExternalTransforms_LDADD = support/liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) @LIBS@ $(QT_CORE_LIBS) $(LIBSHLWAPI)
-check_ExternalTransforms_LDFLAGS = $(QT_CORE_LDFLAGS) $(ADD_FRAMEWORKS)
+check_ExternalTransforms_LDADD = support/liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) @LIBS@ $(QT_LIB) $(LIBSHLWAPI)
+check_ExternalTransforms_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS)
 check_ExternalTransforms_SOURCES = \
 	graphics/GraphicsParams.cpp \
 	insets/ExternalTransforms.cpp \
diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index b843b5193f..6b8dd0c850 100644
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -171,29 +171,29 @@ if INSTALL_MACOSX
 ADD_FRAMEWORKS = -framework QtGui -framework QtCore -framework AppKit -framework ApplicationServices
 endif
 
-check_convert_LDADD = liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) $(QT_CORE_LIBS) $(LIBSHLWAPI) @LIBS@
+check_convert_LDADD = liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) $(QT_LIB) $(LIBSHLWAPI) @LIBS@
 check_convert_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS)
 check_convert_SOURCES = \
 	tests/check_convert.cpp \
 	tests/dummy_functions.cpp \
 	tests/boost.cpp
 
-check_filetools_LDADD = liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) $(QT_CORE_LIBS) $(LIBSHLWAPI) @LIBS@
-check_filetools_LDFLAGS = $(QT_CORE_LDFLAGS) $(ADD_FRAMEWORKS)
+check_filetools_LDADD = liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) $(QT_LIB) $(LIBSHLWAPI) @LIBS@
+check_filetools_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS)
 check_filetools_SOURCES = \
 	tests/check_filetools.cpp \
 	tests/dummy_functions.cpp \
 	tests/boost.cpp
 
-check_lstrings_LDADD = liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) $(QT_CORE_LIBS) $(LIBSHLWAPI) @LIBS@
-check_lstrings_LDFLAGS = $(QT_CORE_LDFLAGS) $(ADD_FRAMEWORKS)
+check_lstrings_LDADD = liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) $(QT_LIB) $(LIBSHLWAPI) @LIBS@
+check_lstrings_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS)
 check_lstrings_SOURCES = \
 	tests/check_lstrings.cpp \
 	tests/dummy_functions.cpp \
 	tests/boost.cpp
 
-check_trivstring_LDADD = liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) $(QT_CORE_LIBS) $(LIBSHLWAPI) @LIBS@
-check_trivstring_LDFLAGS = $(QT_CORE_LDFLAGS) $(ADD_FRAMEWORKS)
+check_trivstring_LDADD = liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) $(QT_LIB) $(LIBSHLWAPI) @LIBS@
+check_trivstring_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS)
 check_trivstring_SOURCES = \
 	tests/check_trivstring.cpp \
 	tests/dummy_functions.cpp \