diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-10-18 09:54:31 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-18 15:47:49 +0200 |
commit | 87274e272d2a854563066489e20d019b4e6320de (patch) | |
tree | d01e71403a41db3ca2b83599fcc7036d79d7a13e /examples/threads/waitconditions | |
parent | 08e24858607d1b1483fb1faa54effa957501cfbb (diff) |
QtBase examples: Remove Maemo/Symbian-specific code.
- Maemo/Symbian are no longer supported and QWidget-based examples
are no longer supposed to run on mobile platforms, so, remove any
Maemo/Symbian or mobile-specific code from source files and
profiles.
- Remove Maemo/Symbian vibration examples.
- Change Q_WS_MAC/WIN to Q_OS_MAC/WIN where appropriate.
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Change-Id: I488a0adadb98934567aa6416206a80465c9c3a81
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Diffstat (limited to 'examples/threads/waitconditions')
-rw-r--r-- | examples/threads/waitconditions/waitconditions.cpp | 46 | ||||
-rw-r--r-- | examples/threads/waitconditions/waitconditions.pro | 2 |
2 files changed, 0 insertions, 48 deletions
diff --git a/examples/threads/waitconditions/waitconditions.cpp b/examples/threads/waitconditions/waitconditions.cpp index 0063db5b91..36c358308a 100644 --- a/examples/threads/waitconditions/waitconditions.cpp +++ b/examples/threads/waitconditions/waitconditions.cpp @@ -44,11 +44,7 @@ #include <stdlib.h> //! [0] -#ifdef Q_WS_S60 -const int DataSize = 300; -#else const int DataSize = 100000; -#endif const int BufferSize = 8192; char buffer[BufferSize]; @@ -107,11 +103,7 @@ public: bufferNotEmpty.wait(&mutex); mutex.unlock(); - #ifdef Q_WS_S60 - emit stringConsumed(QString(buffer[i % BufferSize])); - #else fprintf(stderr, "%c", buffer[i % BufferSize]); - #endif mutex.lock(); --numUsedBytes; @@ -126,48 +118,11 @@ signals: }; //! [4] -#ifdef Q_WS_S60 -class PlainTextEdit : public QPlainTextEdit -{ - Q_OBJECT -public: - PlainTextEdit(QWidget *parent = NULL) : QPlainTextEdit(parent), producer(NULL), consumer(NULL) - { - setTextInteractionFlags(Qt::NoTextInteraction); - - producer = new Producer(this); - consumer = new Consumer(this); - - QObject::connect(consumer, SIGNAL(stringConsumed(const QString &)), SLOT(insertPlainText(const QString &)), Qt::BlockingQueuedConnection); - - QTimer::singleShot(0, this, SLOT(startThreads())); - } - -protected: - Producer *producer; - Consumer *consumer; - -protected slots: - void startThreads() - { - producer->start(); - consumer->start(); - } -}; -#endif //! [5] int main(int argc, char *argv[]) //! [5] //! [6] { -#ifdef Q_WS_S60 - QApplication app(argc, argv); - - PlainTextEdit console; - console.showMaximized(); - - return app.exec(); -#else QCoreApplication app(argc, argv); Producer producer; Consumer consumer; @@ -176,7 +131,6 @@ int main(int argc, char *argv[]) producer.wait(); consumer.wait(); return 0; -#endif } //! [6] diff --git a/examples/threads/waitconditions/waitconditions.pro b/examples/threads/waitconditions/waitconditions.pro index e326afa081..6a3d63b641 100644 --- a/examples/threads/waitconditions/waitconditions.pro +++ b/examples/threads/waitconditions/waitconditions.pro @@ -18,7 +18,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS waitconditions.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/threads/waitconditions INSTALLS += target sources -symbian: CONFIG += qt_example -maemo5: CONFIG += qt_example simulator: warning(This example might not fully work on Simulator platform) |