diff options
| author | Jeremy Katz <jeremy.katz@nokia.com> | 2009-11-02 09:56:46 (GMT) |
|---|---|---|
| committer | Jeremy Katz <jeremy.katz@nokia.com> | 2009-11-02 09:56:46 (GMT) |
| commit | 60cde70b56aa183dce19cc913cd87e1d27f50090 (patch) | |
| tree | 484742af139fa5af591a08891ac64e3840e220f1 | |
| parent | 14832f985044a7b978c68cdbdcc466f32aacb71d (diff) | |
| parent | 2f76e87dba10d001ae7c3e445ef2fade9a255c2b (diff) | |
| download | Qt-60cde70b56aa183dce19cc913cd87e1d27f50090.zip Qt-60cde70b56aa183dce19cc913cd87e1d27f50090.tar.gz Qt-60cde70b56aa183dce19cc913cd87e1d27f50090.tar.bz2 | |
Merge branch 'lighthouse' of scm.dev.nokia.troll.no:qt/qt-lighthouse into lighthouse
| -rw-r--r-- | src/gui/painting/qgraphicssystem.cpp | 4 | ||||
| -rw-r--r-- | src/gui/painting/qgraphicssystem_p.h | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/gui/painting/qgraphicssystem.cpp b/src/gui/painting/qgraphicssystem.cpp index 777b93d..1565c45 100644 --- a/src/gui/painting/qgraphicssystem.cpp +++ b/src/gui/painting/qgraphicssystem.cpp @@ -89,6 +89,10 @@ QList<QGraphicsSystemScreen *> QGraphicsSystem::screens() const return QList<QGraphicsSystemScreen *>(); } +QGraphicsSystemScreen::QGraphicsSystemScreen(QObject *parent) + : QObject(parent) +{} + QGraphicsSystemScreen::~QGraphicsSystemScreen() { } diff --git a/src/gui/painting/qgraphicssystem_p.h b/src/gui/painting/qgraphicssystem_p.h index ea1031f..a2d03f0 100644 --- a/src/gui/painting/qgraphicssystem_p.h +++ b/src/gui/painting/qgraphicssystem_p.h @@ -60,9 +60,11 @@ QT_BEGIN_NAMESPACE class QPixmapFilter; -class Q_GUI_EXPORT QGraphicsSystemScreen +class Q_GUI_EXPORT QGraphicsSystemScreen : public QObject { + Q_OBJECT public: + QGraphicsSystemScreen(QObject *parent = 0); virtual ~QGraphicsSystemScreen(); virtual QRect geometry() const = 0; |