summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qdesktopwidget.h
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2009-07-23 05:47:43 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2009-07-23 05:47:43 (GMT)
commit5054fafde6b32003c8c00877f2579c611d1524f3 (patch)
tree9f79976f970095706e82d7d65b068c1e7b728d97 /src/gui/kernel/qdesktopwidget.h
parentdd652f37353a01e0172e20f1e7ef24b001a281db (diff)
parentdc68651b60b552e010735903e45328f8ebf18f69 (diff)
downloadQt-5054fafde6b32003c8c00877f2579c611d1524f3.zip
Qt-5054fafde6b32003c8c00877f2579c611d1524f3.tar.gz
Qt-5054fafde6b32003c8c00877f2579c611d1524f3.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/gui/kernel/qdesktopwidget.h')
-rw-r--r--src/gui/kernel/qdesktopwidget.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/gui/kernel/qdesktopwidget.h b/src/gui/kernel/qdesktopwidget.h
index 470f10a..a21ae9d 100644
--- a/src/gui/kernel/qdesktopwidget.h
+++ b/src/gui/kernel/qdesktopwidget.h
@@ -56,6 +56,9 @@ class QDesktopWidgetPrivate;
class Q_GUI_EXPORT QDesktopWidget : public QWidget
{
Q_OBJECT
+ Q_PROPERTY(bool virtualDesktop READ isVirtualDesktop)
+ Q_PROPERTY(int screenCount READ screenCount NOTIFY screenCountChanged)
+ Q_PROPERTY(int primaryScreen READ primaryScreen)
public:
QDesktopWidget();
~QDesktopWidget();
@@ -63,6 +66,7 @@ public:
bool isVirtualDesktop() const;
int numScreens() const;
+ int screenCount() const;
int primaryScreen() const;
int screenNumber(const QWidget *widget = 0) const;
@@ -85,6 +89,7 @@ public:
Q_SIGNALS:
void resized(int);
void workAreaResized(int);
+ void screenCountChanged(int);
protected:
void resizeEvent(QResizeEvent *e);
@@ -97,6 +102,9 @@ private:
friend class QApplicationPrivate;
};
+inline int QDesktopWidget::screenCount() const
+{ return numScreens(); }
+
QT_END_NAMESPACE
QT_END_HEADER