threads support is required after all, needs a fix

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 83066c7..cb47f7b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -415,12 +415,13 @@ set_package_properties(Sqlite PROPERTIES
     TYPE RECOMMENDED
 )
 
+# TODO: make it optional, Qt4 was prepping for it I believe (QT_NO_THREAD)
 find_package(Threads)
 set_package_properties(Threads PROPERTIES
     PURPOSE "Required for threads support"
     DESCRIPTION "Platform dependent threads implementation"
     URL ""
-    TYPE RECOMMENDED
+    TYPE REQUIRED
 )
 
 if(NOT KATIE_PLATFORM MATCHES "(win32|wince|mac)" AND NOT KATIE_BOOTSTRAP)

diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/ThreadSpecific.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/ThreadSpecific.h
index 7b68cea..02caefb 100644 (file)
--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/ThreadSpecific.h
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/ThreadSpecific.h
@@ -69,14 +69,14 @@ private:
         ThreadSpecific<T>* owner;
     };
 
-#if ENABLE(SINGLE_THREADED)
+#ifdef QT_NO_THREAD
     T* m_value;
 #else
     QThreadStorage<Data*> m_key;
 #endif
 };
 
-#if ENABLE(SINGLE_THREADED)
+#ifdef QT_NO_THREAD
 template<typename T>
 inline ThreadSpecific<T>::ThreadSpecific()
     : m_value(0)
@@ -131,7 +131,7 @@ inline void ThreadSpecific<T>::set(T* ptr)
 template<typename T>
 inline void ThreadSpecific<T>::destroy(void* ptr)
 {
-#if !ENABLE(SINGLE_THREADED)
+#ifndef QT_NO_THREAD
     Data* data = static_cast<Data*>(ptr);
 
     // See comment as above

diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/qt/ThreadingQt.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/qt/ThreadingQt.cpp
index 6ed5a64..cf06434 100644 (file)
--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/qt/ThreadingQt.cpp
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/qt/ThreadingQt.cpp
@@ -29,7 +29,7 @@
 #include "config.h"
 #include "Threading.h"
 
-#if ENABLE(SINGLE_THREADED)
+#ifdef QT_NO_THREAD
 
 namespace WTF {
 
@@ -44,7 +44,7 @@ void unlockAtomicallyInitializedStaticMutex() { }
 
 } // namespace WTF
 
-#else // SINGLE_THREADED
+#else // QT_NO_THREAD
 
 #include "CurrentTime.h"
 #include "HashMap.h"