diff options
| author | David Faure <faure@kde.org> | 2011-08-15 13:43:45 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-15 15:45:52 +0200 |
| commit | 168fe50106b20b250cdc5499e17f48907bd00f53 (patch) | |
| tree | dd998c84d748881e9ffcd3779a084003940c901d /src | |
| parent | 3a1568c30c80c3681edaeaa472fe9c684ab48454 (diff) | |
Make QThread::sleep/msleep/usleep public.
Merge-request: 43
Reviewed-by: olivier
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Change-Id: Ic5e3ce8f49daf83665865f89fa9fd3488cc5b349
Reviewed-on: http://codereview.qt.nokia.com/2959
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/thread/qthread.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/thread/qthread.h b/src/corelib/thread/qthread.h index bc529fd53b..89a3ad8b1f 100644 --- a/src/corelib/thread/qthread.h +++ b/src/corelib/thread/qthread.h @@ -101,6 +101,10 @@ public: // default argument causes thread to block indefinately bool wait(unsigned long time = ULONG_MAX); + static void sleep(unsigned long); + static void msleep(unsigned long); + static void usleep(unsigned long); + Q_SIGNALS: void started(); void finished(); @@ -112,10 +116,6 @@ protected: static void setTerminationEnabled(bool enabled = true); - static void sleep(unsigned long); - static void msleep(unsigned long); - static void usleep(unsigned long); - protected: QThread(QThreadPrivate &dd, QObject *parent = 0); |