diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-24 16:14:56 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-24 16:14:56 +0100 |
| commit | ff5d39f0a8f34cdb034df703e7b2a769c945e1ed (patch) | |
| tree | 56ec1b5d03809653648e2f50d4ff88be4d7951bd /src/dialogs/qquickdialog.cpp | |
| parent | 51156e412b2f91dbbf8c0b6055e6ab4c29370d8a (diff) | |
| parent | b69eb02366ad6d8647238f4caf8edfdcaea1b526 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
tests/auto/controls/data/tst_applicationwindow.qml
Change-Id: I2ba1f1ba9604f9417102ff076e4ab9ab4d37ab7a
Diffstat (limited to 'src/dialogs/qquickdialog.cpp')
| -rw-r--r-- | src/dialogs/qquickdialog.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/dialogs/qquickdialog.cpp b/src/dialogs/qquickdialog.cpp index 2af1bdc52..9e726ccdf 100644 --- a/src/dialogs/qquickdialog.cpp +++ b/src/dialogs/qquickdialog.cpp @@ -41,6 +41,8 @@ #include "qquickdialog_p.h" #include <QQuickItem> +#include <QQmlEngine> +#include <QStandardPaths> #include <private/qguiapplication_p.h> QT_BEGIN_NAMESPACE @@ -62,12 +64,16 @@ QT_BEGIN_NAMESPACE \qmlsignal QtQuick::Dialogs::Dialog::accepted This signal is emitted by \l accept(). + + The corresponding handler is \c onAccepted. */ /*! \qmlsignal QtQuick::Dialogs::Dialog::rejected This signal is emitted by \l reject(). + + The corresponding handler is \c onRejected. */ /*! @@ -212,7 +218,7 @@ void QQuickDialog::click(QPlatformDialogHelper::StandardButton button, QPlatform emit reset(); break; default: - qWarning("unhandled MessageDialog button %d with role %ld", button, role); + qWarning("unhandled MessageDialog button %d with role %d", (int)button, (int)role); } } |