[aisleriot] themes: qt: Port to qt5
- From: Christian Persch <chpe src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [aisleriot] themes: qt: Port to qt5
- Date: Mon, 5 Sep 2016 16:37:15 +0000 (UTC)
commit ef12ffd8a3f59f8066efefa95023487ad2effa3f
Author: Christian Persch <chpe src gnome org>
Date: Mon Sep 5 18:36:19 2016 +0200
themes: qt: Port to qt5
No changes apart from the configure changes, and needing to
build the libaisleriot convenience library with -fPIC.
configure.ac | 8 ++++----
src/lib/Makefile.am | 2 ++
2 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 5b2ab4e..8b408fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -336,11 +336,11 @@ AM_CONDITIONAL([HAVE_RSVG],[test "$have_rsvg" = "yes"])
have_qtsvg=no
if test "$need_qtsvg" = "yes"; then
- QT_SVG_REQUIRED=4.4.0
+ QT_SVG_REQUIRED=5.0.0
- PKG_CHECK_EXISTS([QtSvg >= $QT_SVG_REQUIRED],[have_qtsvg=yes],[have_qtsvg=no])
+ PKG_CHECK_EXISTS([Qt5Svg >= $QT_SVG_REQUIRED],[have_qtsvg=yes],[have_qtsvg=no])
- PKGS="$PKGS QtSvg >= $QT_SVG_REQUIRED"
+ PKGS="$PKGS Qt5Svg >= $QT_SVG_REQUIRED"
EXTRA_CXX_LIBS="$EXTRA_CXX_LIBS -lstdc++"
AC_DEFINE([HAVE_QTSVG],[1],[Refine if QtSvg is available])
@@ -349,7 +349,7 @@ fi
AM_CONDITIONAL([HAVE_QTSVG],[test "$have_qtsvg" = "yes"])
if test "$need_svg" = "yes" -a "$have_rsvg" = "no" -a "$have_qtsvg" = "no"; then
- AC_MSG_ERROR([One of librsvg or QtSvg are required])
+ AC_MSG_ERROR([One of librsvg or Qt5Svg are required])
fi
# *****************
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 263eafb..3624b7b 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -94,10 +94,12 @@ libaisleriot_la_CPPFLAGS = \
libaisleriot_la_CFLAGS = \
$(AISLERIOT_CFLAGS) \
+ -fPIC \
$(AM_CFLAGS)
libaisleriot_la_CXXFLAGS = \
$(AISLERIOT_CFLAGS) \
+ -fPIC \
$(AM_CXXFLAGS)
libaisleriot_la_LIBADD = \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]