From: Ivailo Monev <xakepa10@gmail.com>
Date: Sun, 13 Mar 2016 17:49:47 +0000 (+0000)
Subject: Make QThread::sleep/msleep/usleep public
X-Git-Tag: 4.12.0~7372
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=128a0472953d2c3fde72f7f422823b0cc47a13e9;p=kde%2FKatie.git

Make QThread::sleep/msleep/usleep public

upstream commits:
https://github.com/qtproject/qtbase/commit/168fe50106b20b250cdc5499e17f48907bd00f53

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
---

diff --git a/src/core/thread/qthread.h b/src/core/thread/qthread.h
index 6c8851874..174cb6844 100644
--- a/src/core/thread/qthread.h
+++ b/src/core/thread/qthread.h
@@ -99,6 +99,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();
@@ -110,11 +114,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);