diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-06 20:14:12 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-06 20:14:12 +0000 |
| commit | 91f5e37f1ab5cd9dddbdf3cf89002816e59d7ade (patch) | |
| tree | 0db58aa7e971850fb993daa5d9ef12b755039722 | |
| parent | 03e0aaf7a77da7d1a7f314d466a9225dbc25612b (diff) | |
| download | admin-91f5e37f1ab5cd9dddbdf3cf89002816e59d7ade.tar.gz admin-91f5e37f1ab5cd9dddbdf3cf89002816e59d7ade.zip | |
Fix Qt4 handling of threading
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kde-common/admin@1212392 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
| -rw-r--r-- | acinclude.m4.in | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/acinclude.m4.in b/acinclude.m4.in index a2a33a4..443ca62 100644 --- a/acinclude.m4.in +++ b/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 |