diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-19 16:34:30 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-19 16:34:30 +0200 |
| commit | 1d7b5b2e1c798335e20c7fc269e8f8238505eba0 (patch) | |
| tree | 125ece1cda05867a0fb6a3e67359daa58d050422 | |
| parent | e2bcb43fdccf72c12d679ebfd63955bce342d6a7 (diff) | |
| parent | b73a47aa17fcb020ed70fa99c7792210c83ff16f (diff) | |
| download | qttools-1d7b5b2e1c798335e20c7fc269e8f8238505eba0.tar.gz qttools-1d7b5b2e1c798335e20c7fc269e8f8238505eba0.tar.bz2 qttools-1d7b5b2e1c798335e20c7fc269e8f8238505eba0.zip | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
examples/designer/doc/src/arthurplugin.qdoc
Change-Id: I5c0118a90111b51db04d2ea2eb6b3c47f1fb761f
| -rw-r--r-- | examples/designer/doc/src/arthurplugin.qdoc | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/examples/designer/doc/src/arthurplugin.qdoc b/examples/designer/doc/src/arthurplugin.qdoc deleted file mode 100644 index b8f50f12..00000000 --- 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. -*/ |