diff options
| author | mread <qt-info@nokia.com> | 2009-08-07 13:34:12 (GMT) |
|---|---|---|
| committer | mread <qt-info@nokia.com> | 2009-08-07 13:34:12 (GMT) |
| commit | 5a72890b7ce12815f9567316da867006cff73f39 (patch) | |
| tree | 46c8c793f19274f9ed19678d1732d2123adbdf34 /src/gui/kernel/qdesktopwidget.h | |
| parent | 0f6f1f841cea61cbb6905de92c2ca63bd369d55d (diff) | |
| parent | cc0a411e5e874aa224c26298a109973cb15ea291 (diff) | |
| download | Qt-5a72890b7ce12815f9567316da867006cff73f39.zip Qt-5a72890b7ce12815f9567316da867006cff73f39.tar.gz Qt-5a72890b7ce12815f9567316da867006cff73f39.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Conflicts fixed:
src/corelib/io/qdiriterator.cpp
Diffstat (limited to 'src/gui/kernel/qdesktopwidget.h')
| -rw-r--r-- | src/gui/kernel/qdesktopwidget.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/gui/kernel/qdesktopwidget.h b/src/gui/kernel/qdesktopwidget.h index d61e00c..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,18 +89,22 @@ public: Q_SIGNALS: void resized(int); void workAreaResized(int); + void screenCountChanged(int); protected: void resizeEvent(QResizeEvent *e); private: Q_DISABLE_COPY(QDesktopWidget) - Q_DECLARE_SCOPED_PRIVATE(QDesktopWidget) + Q_DECLARE_PRIVATE(QDesktopWidget) friend class QApplication; friend class QApplicationPrivate; }; +inline int QDesktopWidget::screenCount() const +{ return numScreens(); } + QT_END_NAMESPACE QT_END_HEADER |