diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-10 21:11:23 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-10 21:11:23 +0200 |
| commit | c6713e212ef0b97c45d6466b73220567e94a05f1 (patch) | |
| tree | 8774d26bf05f2087c510d16da42bfd0dc59a54b1 /src/dialogs/qquickdialog.cpp | |
| parent | ce97d9c8ef4e6f8cb2166065b6732cad3cccf604 (diff) | |
| parent | 0e00f9fa1cbdbdd2128f2ca31172d88f701ecb59 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
examples/quickcontrols/extras/flat/main.cpp
src/controls/Private/qquickcontrolsettings.cpp
Change-Id: I9eb9342a2ee994611f3cb18daab6dd89eb924ccc
Diffstat (limited to 'src/dialogs/qquickdialog.cpp')
| -rw-r--r-- | src/dialogs/qquickdialog.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dialogs/qquickdialog.cpp b/src/dialogs/qquickdialog.cpp index c6f50df00..33e3b02b9 100644 --- a/src/dialogs/qquickdialog.cpp +++ b/src/dialogs/qquickdialog.cpp @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE \qmltype Dialog \instantiates QQuickDialog \inqmlmodule QtQuick.Dialogs - \ingroup dialogs + \ingroup qtquickdialogs \brief A generic QtQuick dialog wrapper with standard buttons. \since 5.3 |