diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-03-31 10:03:31 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-03-31 10:03:31 +0200 |
| commit | ce9519593a0b3deb99d1dd2529770f7e9fffef92 (patch) | |
| tree | c9bca05230dd68f49494240ae930bad1fe0c5956 /src/plugins/platforms/android/qandroidplatformdialoghelpers.h | |
| parent | 509f77cca28aa3edea5523c5869bae4412ed2ccc (diff) | |
| parent | 7baaec17edb06634f1d6235a55c7adbd112cba3e (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
mkspecs/android-g++/qmake.conf
qmake/generators/unix/unixmake2.cpp
src/gui/image/qimage_conversions.cpp
Change-Id: Ib76264b8c2d29a0228438ec02bd97d4b97545be0
Diffstat (limited to 'src/plugins/platforms/android/qandroidplatformdialoghelpers.h')
| -rw-r--r-- | src/plugins/platforms/android/qandroidplatformdialoghelpers.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/platforms/android/qandroidplatformdialoghelpers.h b/src/plugins/platforms/android/qandroidplatformdialoghelpers.h index a70468000f..94f01a1835 100644 --- a/src/plugins/platforms/android/qandroidplatformdialoghelpers.h +++ b/src/plugins/platforms/android/qandroidplatformdialoghelpers.h @@ -57,6 +57,9 @@ public slots: void dialogResult(int buttonID); private: + void addButtons(QSharedPointer<QMessageDialogOptions> opt, ButtonRole role); + +private: int m_buttonId; QEventLoop m_loop; QJNIObjectPrivate m_javaMessageDialog; |