From 75700b95182cf309f125a32ee1d800a18bfa2e96 Mon Sep 17 00:00:00 2001 From: Christian Hohnstaedt Date: Fri, 18 Sep 2015 18:17:40 +0200 Subject: [PATCH] Fixes for Qt5 and Mac OSX --- README.md | 5 +++++ configure.ac | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 8af9036d..5336f7cf 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,11 @@ ## __Changelog:__ +### xca 1.3.1 + + * Fix endless loop while searching for a signer of a CRL + (XCA does not respond) + ### xca 1.3.0 * Update to OpenSSL 1.0.2d for Windows and MAC * SF Bug #105 1.2.0 OS X Retina Display Support diff --git a/configure.ac b/configure.ac index 57c0914a..1783625d 100644 --- a/configure.ac +++ b/configure.ac @@ -91,7 +91,8 @@ PKG_CHECK_MODULES(QT5, [Qt5Core >= 5.0, Qt5Widgets >= 5.0], [ QT_MOC="`pkg-config --variable=moc_location Qt5Core`" QT_UIC="`pkg-config --variable=uic_location Qt5Core`" if test -n "$DARWIN"; then - QT_CFLAGS="$QT_CFLAGS -F`pkg-config --variable=libdir Qt5Core`" + FRAMEDIR=`pkg-config --variable=libdir Qt5Core` + QT5_CFLAGS="$QT5_CFLAGS -F${FRAMEDIR} -I${FRAMEDIR}/QtCore.framework/Headers -I${FRAMEDIR}/QtGui.framework/Headers -I${FRAMEDIR}/QtWdgets.framework/Headers" fi QT_VERSION=5 QT_CFLAGS="${QT5_CFLAGS} -fPIC" @@ -101,10 +102,11 @@ PKG_CHECK_MODULES(QT5, [Qt5Core >= 5.0, Qt5Widgets >= 5.0], [ QT_MOC="`pkg-config --variable=moc_location QtCore`" QT_UIC="`pkg-config --variable=uic_location QtCore`" if test -n "$DARWIN"; then - QT_CFLAGS="$QT_CFLAGS -F`pkg-config --variable=libdir QtCore`" + FRAMEDIR=`pkg-config --variable=libdir QtCore` + QT4_CFLAGS="$QT4_CFLAGS -F${FRAMEDIR} -I${FRAMEDIR}/QtCore.framework/Headers -I${FRAMEDIR}/QtGui.framework/Headers" fi QT_VERSION=4 - QT_CFLAGS="${QT4_CFLAGS} -fPIC" + QT_CFLAGS="${QT4_CFLAGS}" QT_LIBS="${QT4_LIBS}" ], [ if test -z "$DARWIN"; then