diff options
| author | Shawn Rutledge <shawn.rutledge@digia.com> | 2014-01-15 10:32:40 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-15 13:59:35 +0100 |
| commit | 0c2873241ab6ff9fbdd4a1c1479e48d121879ccb (patch) | |
| tree | cbc6df6abb949b62c232fd9396b6a124a0cdfde9 | |
| parent | d16f084b267140b4a901e437c3facebbdf08d89f (diff) | |
| download | qtquickcontrols-0c2873241ab6ff9fbdd4a1c1479e48d121879ccb.tar.gz | |
QtQuick Dialogs: don't use native windows on iOS
Re-applying changes from 560b95b77ac18edd0954a9b8ce9b92a828b51176
in the qtdeclarative repository which were done after beginning to move
the dialogs into qtquickcontrols.
Task-number: QTBUG-35561
Change-Id: I9651be2066e44310afcd4ec9e626583acfec8c8e
Reviewed-by: Liang Qi <liang.qi@digia.com>
| -rw-r--r-- | src/dialogs/qquickabstractdialog.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/dialogs/qquickabstractdialog.cpp b/src/dialogs/qquickabstractdialog.cpp index 633e5b72..9bb23887 100644 --- a/src/dialogs/qquickabstractdialog.cpp +++ b/src/dialogs/qquickabstractdialog.cpp @@ -62,7 +62,9 @@ QQuickAbstractDialog::QQuickAbstractDialog(QObject *parent) , m_contentItem(0) , m_windowDecoration(0) , m_hasNativeWindows(QGuiApplicationPrivate::platformIntegration()-> - hasCapability(QPlatformIntegration::MultipleWindows)) + hasCapability(QPlatformIntegration::MultipleWindows) && + QGuiApplicationPrivate::platformIntegration()-> + hasCapability(QPlatformIntegration::WindowManagement)) , m_hasAspiredPosition(false) { } |