diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-10 18:28:56 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-10 18:28:56 +0100 |
| commit | f6946ef741d44b2e6a959368716f20c40e307039 (patch) | |
| tree | fd7537f208245478350e6413973d9dbc3a6d7e48 | |
| parent | 87fade807a97fb5ae9fac2c0d0826c1bfd05e587 (diff) | |
| parent | f308fb8a19f2d684cc2e6d06d230184474539eef (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ie06cc013bf7d6c5a4423ff729599c6fa73d9b416
| -rw-r--r-- | doc/src/howtos/scalabilityintro.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/platforms/windows.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/qmlapp/qtquicktest.qdoc | 8 | ||||
| -rw-r--r-- | doc/src/whatsnew/whatsnew52.qdoc | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/doc/src/howtos/scalabilityintro.qdoc b/doc/src/howtos/scalabilityintro.qdoc index 16f7847e4..4b44d6273 100644 --- a/doc/src/howtos/scalabilityintro.qdoc +++ b/doc/src/howtos/scalabilityintro.qdoc @@ -75,7 +75,7 @@ application has more tham one top-level layout. Such a top-level layout is also often referred to as a page, i.e., a layout that uses the entire screen. For instance, an organizer application - will typically have separate pages for showing the calender and + will typically have separate pages for showing the calendar and editing todo items. You should define the measurements separate from the UI, for diff --git a/doc/src/platforms/windows.qdoc b/doc/src/platforms/windows.qdoc index a0913c701..c5ced56ed 100644 --- a/doc/src/platforms/windows.qdoc +++ b/doc/src/platforms/windows.qdoc @@ -150,7 +150,7 @@ If you installed additional OpenGL drivers from your hardware vendor, then you may want to consider using this version of OpenGL instead of ANGLE. To use OpenGL, pass the command line options \c{-opengl desktop} to the - the configure script. + configure script. \code configure -opengl desktop diff --git a/doc/src/qmlapp/qtquicktest.qdoc b/doc/src/qmlapp/qtquicktest.qdoc index 62369c152..722297b56 100644 --- a/doc/src/qmlapp/qtquicktest.qdoc +++ b/doc/src/qmlapp/qtquicktest.qdoc @@ -32,8 +32,8 @@ \section1 Introduction - QtQuickTest is a unit test framework for QML applications. - Test cases are written as JavaScript functions within a TestCase + \l {Qt Quick Test QML Types}{Qt Quick Test} is a unit test framework for QML applications. + Test cases are written as JavaScript functions within a \l {QtTest::TestCase}{TestCase} type: \code @@ -54,8 +54,8 @@ \endcode Functions whose names start with \c{test_} are treated as test cases - to be executed. See the documentation for the \l TestCase and - \l SignalSpy types for more information on writing test cases. + to be executed. See the documentation for the \l {QtTest::TestCase}{TestCase} and + \l {QtTest::SignalSpy}{SignalSpy} types for more information on writing test cases. \section1 Running tests diff --git a/doc/src/whatsnew/whatsnew52.qdoc b/doc/src/whatsnew/whatsnew52.qdoc index 5d403ad34..1aadc07d1 100644 --- a/doc/src/whatsnew/whatsnew52.qdoc +++ b/doc/src/whatsnew/whatsnew52.qdoc @@ -158,7 +158,7 @@ \list \li Added a new \l{Qt Quick Scene Graph}{scenegraph} renderer for improved performance \li Added texture atlas support in SceneGraph - \li Added new \e animator types, which can run animations on the the scene graph's render thread. + \li Added new \e animator types, which can run animations on the scene graph's render thread. \li Support for external drag-and-drop \endlist |