aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSamuel Rødal <samuel.rodal@digia.com>2012-11-08 15:34:26 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-09 08:56:27 +0100
commit0df606e2ab8f3b60e1ad57dba245acf2e7810612 (patch)
tree2fd9efffda93df30413528806473ea13db6838c5 /src
parentffab396a1d3a6054fca6c2727cd685ea89dada0e (diff)
Expose "Qt.application.supportsMultipleWindows".
Useful on platforms like kms and eglfs that only support a single QWindow. On those platforms the QML application can thus choose to use a Rectangle instead of a Window to show dialogs etc. Change-Id: Idc3f46d2cad6cf3f55c5c84df2c8511407bd4849 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Alan Alpert (RIM) <aalpert@rim.com>
Diffstat (limited to 'src')
-rw-r--r--src/quick/util/qquickapplication.cpp7
-rw-r--r--src/quick/util/qquickapplication_p.h2
2 files changed, 9 insertions, 0 deletions
diff --git a/src/quick/util/qquickapplication.cpp b/src/quick/util/qquickapplication.cpp
index 27ee2f0be1..962fb52d05 100644
--- a/src/quick/util/qquickapplication.cpp
+++ b/src/quick/util/qquickapplication.cpp
@@ -42,6 +42,8 @@
#include "qquickapplication_p.h"
#include <private/qobject_p.h>
+#include <private/qguiapplication_p.h>
+#include <qpa/qplatformintegration.h>
#include <QtGui/QGuiApplication>
#include <QtCore/QDebug>
@@ -91,6 +93,11 @@ Qt::LayoutDirection QQuickApplication::layoutDirection() const
return d->direction;
}
+bool QQuickApplication::supportsMultipleWindows() const
+{
+ return QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::MultipleWindows);
+}
+
bool QQuickApplication::eventFilter(QObject *, QEvent *event)
{
Q_D(QQuickApplication);
diff --git a/src/quick/util/qquickapplication_p.h b/src/quick/util/qquickapplication_p.h
index 5cf31efe5c..5519f22243 100644
--- a/src/quick/util/qquickapplication_p.h
+++ b/src/quick/util/qquickapplication_p.h
@@ -57,12 +57,14 @@ class Q_AUTOTEST_EXPORT QQuickApplication : public QObject
Q_OBJECT
Q_PROPERTY(bool active READ active NOTIFY activeChanged)
Q_PROPERTY(Qt::LayoutDirection layoutDirection READ layoutDirection NOTIFY layoutDirectionChanged)
+ Q_PROPERTY(bool supportsMultipleWindows READ supportsMultipleWindows CONSTANT)
public:
explicit QQuickApplication(QObject *parent = 0);
virtual ~QQuickApplication();
bool active() const;
Qt::LayoutDirection layoutDirection() const;
+ bool supportsMultipleWindows() const;
Q_SIGNALS:
void activeChanged();