Index: src/mutex/qt_mutex/mux_qt.cpp
===================================================================
--- src/mutex/qt_mutex/mux_qt.cpp.orig	2011-06-20 15:52:09.000000000 +0200
+++ src/mutex/qt_mutex/mux_qt.cpp	2011-06-21 14:56:14.738269417 +0200
@@ -9,7 +9,7 @@
 #include <botan/internal/mux_qt.h>
 #include <qmutex.h>
 
-#if !defined(QT_THREAD_SUPPORT)
+#if !(defined(QT_THREAD_SUPPORT) || !defined(QT_NO_THREAD))
    #error Your version of Qt does not support threads or mutexes
 #endif
 
Index: src/mutex/qt_mutex/info.txt
===================================================================
--- src/mutex/qt_mutex/info.txt.orig	2011-06-20 15:52:09.000000000 +0200
+++ src/mutex/qt_mutex/info.txt	2011-06-21 14:55:17.957040061 +0200
@@ -13,5 +13,5 @@ mux_qt.h
 # I think we want to always use qt-mt, not qt -- not much point in supporting
 # mutexes in a single threaded application, after all.
 <libs>
-all -> qt-mt
+all -> QtCore
 </libs>