diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-09-16 13:49:26 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-09-16 14:52:40 +0200 |
commit | 8c6755aeec312ae771ef334fc863642514db3f7c (patch) | |
tree | 3ccec405ee35690bdb7def6c0a3c42866bd9adc2 /examples/widgets | |
parent | 104debb6627d71f5540bb2c3347ce56dddc63594 (diff) | |
parent | c40a48af997f57caa0ecfca0b247837ba5b2f89b (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/corelib/tools/qstring.cpp
Change-Id: Ifc6cd3a0f1cf14cc0fe6cf30afb0c7f40cfdbc3e
Diffstat (limited to 'examples/widgets')
3 files changed, 2 insertions, 8 deletions
diff --git a/examples/widgets/tutorials/threads/hellothread/hellothread.cpp b/examples/widgets/tutorials/threads/hellothread/hellothread.cpp index 4395b0cb2b..1b5088e0db 100644 --- a/examples/widgets/tutorials/threads/hellothread/hellothread.cpp +++ b/examples/widgets/tutorials/threads/hellothread/hellothread.cpp @@ -44,10 +44,7 @@ * demonstrates use of QThread, says hello in another thread and terminates */ -//! [1] -// hellothread/hellothread.cpp void HelloThread::run() { qDebug() << "hello from worker thread " << thread()->currentThreadId(); } -//! [1] diff --git a/examples/widgets/tutorials/threads/hellothread/hellothread.h b/examples/widgets/tutorials/threads/hellothread/hellothread.h index c2d8ad73ee..281f2c6cb5 100644 --- a/examples/widgets/tutorials/threads/hellothread/hellothread.h +++ b/examples/widgets/tutorials/threads/hellothread/hellothread.h @@ -42,13 +42,12 @@ #define HELLOTHREAD_H #include <QThread> -//! [1] -// hellothread/hellothread.h + class HelloThread : public QThread { Q_OBJECT private: void run(); }; -//! [1] + #endif // HELLOTHREAD_H diff --git a/examples/widgets/tutorials/threads/hellothread/main.cpp b/examples/widgets/tutorials/threads/hellothread/main.cpp index 87660f97ee..8b4b00874f 100644 --- a/examples/widgets/tutorials/threads/hellothread/main.cpp +++ b/examples/widgets/tutorials/threads/hellothread/main.cpp @@ -41,7 +41,6 @@ #include <QtCore> #include "hellothread.h" -//! [1] int main(int argc, char *argv[]) { QCoreApplication app(argc, argv); @@ -51,4 +50,3 @@ int main(int argc, char *argv[]) thread.wait(); // do not exit before the thread is completed! return 0; } -//! [1] |