diff options
Diffstat (limited to 'examples/corelib')
| -rw-r--r-- | examples/corelib/ipc/ipc.pro | 2 | ||||
| -rw-r--r-- | examples/corelib/threads/mandelbrot/mandelbrot.pro | 2 | ||||
| -rw-r--r-- | examples/corelib/tools/customtype/message.cpp | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/examples/corelib/ipc/ipc.pro b/examples/corelib/ipc/ipc.pro index 4b4b3870a4..5fc3c7457f 100644 --- a/examples/corelib/ipc/ipc.pro +++ b/examples/corelib/ipc/ipc.pro @@ -2,5 +2,5 @@ requires(qtHaveModule(widgets)) TEMPLATE = subdirs # no QSharedMemory -!vxworks:!qnx:SUBDIRS = sharedmemory +!vxworks:SUBDIRS = sharedmemory !wince*:qtHaveModule(network): SUBDIRS += localfortuneserver localfortuneclient diff --git a/examples/corelib/threads/mandelbrot/mandelbrot.pro b/examples/corelib/threads/mandelbrot/mandelbrot.pro index 5a01a405f2..92010fdc1f 100644 --- a/examples/corelib/threads/mandelbrot/mandelbrot.pro +++ b/examples/corelib/threads/mandelbrot/mandelbrot.pro @@ -6,7 +6,7 @@ SOURCES = main.cpp \ mandelbrotwidget.cpp \ renderthread.cpp -unix:!mac:!vxworks:!integrity:LIBS += -lm +unix:!mac:!vxworks:!integrity:!haiku:LIBS += -lm # install target.path = $$[QT_INSTALL_EXAMPLES]/corelib/threads/mandelbrot diff --git a/examples/corelib/tools/customtype/message.cpp b/examples/corelib/tools/customtype/message.cpp index c470ab116e..eb8befc36f 100644 --- a/examples/corelib/tools/customtype/message.cpp +++ b/examples/corelib/tools/customtype/message.cpp @@ -65,7 +65,8 @@ Message::Message(const QString &body, const QStringList &headers) //! [custom type streaming operator] QDebug operator<<(QDebug dbg, const Message &message) { - QStringList pieces = message.body().split("\r\n", QString::SkipEmptyParts); + const QString body = message.body(); + QVector<QStringRef> pieces = body.splitRef("\r\n", QString::SkipEmptyParts); if (pieces.isEmpty()) dbg.nospace() << "Message()"; else if (pieces.size() == 1) |