From 168fe50106b20b250cdc5499e17f48907bd00f53 Mon Sep 17 00:00:00 2001 From: David Faure Date: Mon, 15 Aug 2011 13:43:45 +0200 Subject: Make QThread::sleep/msleep/usleep public. Merge-request: 43 Reviewed-by: olivier Reviewed-by: Frederik Gladhorn Change-Id: Ic5e3ce8f49daf83665865f89fa9fd3488cc5b349 Reviewed-on: http://codereview.qt.nokia.com/2959 Reviewed-by: Frederik Gladhorn Reviewed-by: Qt Sanity Bot --- src/corelib/thread/qthread.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') 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); -- cgit v1.2.3