diff options
| author | Morten Johan Sørvig <morten.sorvig@qt.io> | 2018-06-01 14:47:56 +0200 |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@qt.io> | 2018-06-04 11:29:38 +0000 |
| commit | a942de570e2288afa33b9b0b7a54db13e4a56892 (patch) | |
| tree | 6b3a1651b248172371789e2df9abb56659fe133d /src/corelib/kernel | |
| parent | 6d199358d79f91508a38749b8b2cb71248b9a0b3 (diff) | |
wasm: wip/webassembly <-> 5.11 diff minimization
Fix whitespace and formatting issues, remove extra
code.
Change-Id: Ic98f8e386a4bff4ed3570ad23372a787f949ba35
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qelapsedtimer_unix.cpp | 1 | ||||
| -rw-r--r-- | src/corelib/kernel/qeventloop.h | 1 | ||||
| -rw-r--r-- | src/corelib/kernel/qobject.cpp | 1 |
3 files changed, 1 insertions, 2 deletions
diff --git a/src/corelib/kernel/qelapsedtimer_unix.cpp b/src/corelib/kernel/qelapsedtimer_unix.cpp index 4ef113a637..e166d4e3d2 100644 --- a/src/corelib/kernel/qelapsedtimer_unix.cpp +++ b/src/corelib/kernel/qelapsedtimer_unix.cpp @@ -48,7 +48,6 @@ #include <time.h> #endif #include <unistd.h> -#include <QDebug> #include <qatomic.h> #include "private/qcore_unix_p.h" diff --git a/src/corelib/kernel/qeventloop.h b/src/corelib/kernel/qeventloop.h index 6f3968ed83..eb1348220b 100644 --- a/src/corelib/kernel/qeventloop.h +++ b/src/corelib/kernel/qeventloop.h @@ -70,7 +70,6 @@ public: bool processEvents(ProcessEventsFlags flags = AllEvents); void processEvents(ProcessEventsFlags flags, int maximumTime); - int exec(ProcessEventsFlags flags = AllEvents); void exit(int returnCode = 0); bool isRunning() const; diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index 016b67d790..7a8aa61ee2 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -1459,6 +1459,7 @@ QThread *QObject::thread() const void QObject::moveToThread(QThread *targetThread) { Q_D(QObject); + if (d->threadData->thread == targetThread) { // object is already in this thread return; |