Merge QThread class definitions

We can reuse the main QThread definition for the no-thread
configuration and avoid having to keep them in sync.
Add stub definitions for member functions where needed.

Change-Id: I128db11684a6040d09c4a4ce114f1399cba523f8
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>

1 files changed, 69 insertions, 0 deletions

diff --git a/src/corelib/thread/qthread.cpp b/src/corelib/thread/qthread.cpp
index a4101764bc..5df0508829 100644
--- a/src/corelib/thread/qthread.cpp
+++ b/src/corelib/thread/qthread.cpp
@@ -765,11 +765,80 @@ QThread::QThread(QObject *parent)
     d->data->thread = this;
 }
 
+QThread::~QThread()
+{
+
+}
+
+void QThread::run()
+{
+
+}
+
+int QThread::exec()
+{
+    return 0;
+}
+
+void QThread::start(Priority priority)
+{
+    Q_D(QThread);
+    Q_UNUSED(priority);
+    d->running = true;
+}
+
+void QThread::terminate()
+{
+
+}
+
+void QThread::quit()
+{
+
+}
+
+bool QThread::wait(unsigned long time)
+{
+    Q_UNUSED(time);
+    return false;
+}
+
+bool QThread::event(QEvent* event)
+{
+    return QObject::event(event);
+}
+
+Qt::HANDLE QThread::currentThreadId() Q_DECL_NOTHROW
+{
+    return Qt::HANDLE(currentThread());
+}
+
 QThread *QThread::currentThread()
 {
     return QThreadData::current()->thread;
 }
 
+int QThread::idealThreadCount() Q_DECL_NOTHROW
+{
+    return 1;
+}
+
+void QThread::yieldCurrentThread()
+{
+
+}
+
+bool QThread::isFinished() const
+{
+    return false;
+}
+
+bool QThread::isRunning() const
+{
+    Q_D(const QThread);
+    return d->running;
+}
+
 // No threads: so we can just use static variables
 static QThreadData *data = 0;