casa-mp-base

--- src/corelib/concurrent/qthreadpool.cpp.orig

+++ src/corelib/concurrent/qthreadpool.cpp

@@ -45,6 +45,8 @@

 #ifndef QT_NO_THREAD

+static QScopedPointer<QThreadPool> gThreadPool(new QThreadPool());

+

 QT_BEGIN_NAMESPACE

 inline bool operator<(int priority, const QPair<QRunnable *, int> &p)

@@ -56,23 +58,6 @@

     return priority < p.second;

 }

-Q_GLOBAL_STATIC(QThreadPool, theInstance)

-

-/*

-    QThread wrapper, provides synchronization against a ThreadPool

-*/

-class QThreadPoolThread : public QThread

-{

-public:

-    QThreadPoolThread(QThreadPoolPrivate *manager);

-    void run();

-    void registerThreadInactive();

-

-    QWaitCondition runnableReady;

-    QThreadPoolPrivate *manager;

-    QRunnable *runnable;

-};

-

 /*

     QThreadPool private class.

 */

@@ -81,8 +66,8 @@

 /*!\internal

 */

-QThreadPoolThread::QThreadPoolThread(QThreadPoolPrivate *manager)

-    :manager(manager), runnable(0)

+QThreadPoolThread::QThreadPoolThread()

+    :manager(0), runnable(0)

 { }

 /* \internal

@@ -240,13 +225,20 @@

     return activeThreadCount > maxThreadCount && (activeThreadCount - reservedThreads) > 1;

 }

+QThreadPoolThread* QThreadPool::createThreadPoolThread() const

+{

+    QThreadPoolThread* ret = new QThreadPoolThread();

+    ret->setObjectName(QLatin1String("Thread (pooled)"));

+    return ret;

+}

+

 /*! \internal

 */

 void QThreadPoolPrivate::startThread(QRunnable *runnable)

 {

-    QScopedPointer <QThreadPoolThread> thread(new QThreadPoolThread(this));