From ce1a03a49ad5a3845d22c2e36cb463fed03eb38d Mon Sep 17 00:00:00 2001 From: tpearson Date: Thu, 6 Jan 2011 20:14:12 +0000 Subject: [PATCH] Fix Qt4 handling of threading git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kde-common@1212392 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- admin/acinclude.m4.in | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/admin/acinclude.m4.in b/admin/acinclude.m4.in index a2a33a4..443ca62 100644 --- a/admin/acinclude.m4.in +++ b/admin/acinclude.m4.in @@ -1414,7 +1414,11 @@ AC_ARG_ENABLE( if test $kde_qtver = 3; then kde_use_qt_mt=yes else - kde_use_qt_mt=no + if test $kde_qtver = 4; then + kde_use_qt_mt=yes + else + kde_use_qt_mt=no + fi fi ] ) @@ -1495,10 +1499,14 @@ dnl If we got --enable-qt-mt then adjust the Qt library name for the host. dnl ------------------------------------------------------------------------ if test "x$kde_use_qt_mt" = "xyes"; then - LIBQT="-l$qtlib-mt" - kde_int_qt="-l$qtlib-mt" - if test "$kde_qtver" = "3"; then + if test $kde_qtver = 3; then + LIBQT="-l$qtlib-mt" + kde_int_qt="-l$qtlib-mt" LIBQT_GLOB="lib$qtlib-mt.*" + else + if test $kde_qtver = 4; then + LIBQT="-l$qtlib" + fi fi USING_QT_MT="using -mt" else