Merge remote-tracking branch 'origin/5.5' into 5.6

Change-Id: Ic1c578187b99013c40fe686f98fc85d5917240fe

2 files changed, 1 insertions, 43 deletions

diff --git a/examples/assistant/doc/src/simpletextviewer.qdoc b/examples/assistant/doc/src/simpletextviewer.qdoc
index dda039ec0..b23967916 100644
--- a/examples/assistant/doc/src/simpletextviewer.qdoc
+++ b/examples/assistant/doc/src/simpletextviewer.qdoc
@@ -330,7 +330,7 @@
     To start the process we need the executable name of \QA as well as the
     command line arguments for running \QA in a customized mode. The
     executable name is a little bit tricky since it depends on the
-    platform, but fortunately it is only different on Mac OS X.
+    platform, but fortunately it is only different on OS X.
 
     The displayed documentation can be altered using the \c -collectionFile
     command line argument when launching \QA. When started without any options,
diff --git a/examples/designer/doc/src/arthurplugin.qdoc b/examples/designer/doc/src/arthurplugin.qdoc
deleted file mode 100644
index b8f50f129..000000000
--- a/examples/designer/doc/src/arthurplugin.qdoc
+++ /dev/null
@@ -1,42 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
-    \example arthurplugin
-    \ingroup examples-designer
-    \title Arthur Plugin
-
-    \brief Using the Qt painting system with \QD custom widget plugins.
-
-    \image arthurplugin-demo.png
-
-    The specialized widgets used in the other examples of the Arthur
-    painting system are provided as custom widgets to be used with \QD.
-    Since each of the widgets provides a set of signals and slots, the
-    effects they show can be controlled by connecting them up to standard
-    input widgets.
-*/