OSDN Git Service

Make QThread::sleep/msleep/usleep public
authorIvailo Monev <xakepa10@gmail.com>
Sun, 13 Mar 2016 17:49:47 +0000 (17:49 +0000)
committerIvailo Monev <xakepa10@gmail.com>
Sun, 13 Mar 2016 17:49:47 +0000 (17:49 +0000)
upstream commits:
https://github.com/qtproject/qtbase/commit/168fe50106b20b250cdc5499e17f48907bd00f53

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
src/core/thread/qthread.h

index 6c88518..174cb68 100644 (file)
@@ -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);