Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team: (485 commits)
  Remove a race condition in SIGCHLD handler.
  Fix warnings about && inside ||
  Update XCreateWindow in qgl_X11egl.cpp
  Allow enum values to be used as signal parameters
  ListModel::clear() should not clear roles
  Lancelot: support for custom keys added to protocol. API cleanup.
  Make sure removed QTextBlock is invalid
  Cocoa: Fixup wrong code in patch baaa5ae
  Designer: Allow promoted QWidget's to be buddies.
  Designer: Specify 'notr' attribute for buttongroup name.
  [QTBUG-15278] QWidget::windowState gets out of sync (Aero Snap)
  HTTP cacheing: do not store the date header with the resource
  Let's not write to the source buffer when blending argb32 on rgb16.
  Add support for -unset <prop> option to qmake.
  make -markuntranslated work without -idbased
  fix conditional on shell type
  Updated QtOpenGL DEF file
  Lancelot: bail out if rendering consistently fails
  Minor optimization to lance/elot
  Make it possible to test the new font hinting in lance[elot]
  ...

1 files changed, 88 insertions, 0 deletions

diff --git a/doc/src/snippets/code/doc_src_qtestlib.cpp b/doc/src/snippets/code/doc_src_qtestlib.cpp
new file mode 100644
index 0000000..bd98807
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_qtestlib.cpp
@@ -0,0 +1,88 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//! [0]
+class MyFirstTest: public QObject
+{
+    Q_OBJECT
+private slots:
+    void initTestCase()
+    { qDebug("called before everything else"); }
+    void myFirstTest()
+    { QVERIFY(1 == 1); }
+    void mySecondTest()
+    { QVERIFY(1 != 2); }
+    void cleanupTestCase()
+    { qDebug("called after myFirstTest and mySecondTest"); }
+};
+//! [0]
+
+
+//! [8]
+void TestQString::toUpper()
+{
+    QString str = "Hello";
+    QVERIFY(str.toUpper() == "HELLO");
+}
+//! [8]
+
+
+//! [11]
+QCOMPARE(QString("hello").toUpper(), QString("HELLO"));
+QCOMPARE(QString("Hello").toUpper(), QString("HELLO"));
+QCOMPARE(QString("HellO").toUpper(), QString("HELLO"));
+QCOMPARE(QString("HELLO").toUpper(), QString("HELLO"));
+//! [11]
+
+//! [12]
+class MyFirstBenchmark: public QObject
+{
+    Q_OBJECT
+private slots:
+    void myFirstBenchmark()
+    { 
+        QString string1;
+        QString string2;
+        QBENCHMARK {
+            string1.localeAwareCompare(string2);
+        }
+    }
+};
+//! [12]