diff options
| author | Kimmo Hämäläinen <kimmo.hamalainen@nokia.com> | 2010-04-30 13:52:05 +0300 |
|---|---|---|
| committer | Kimmo Hämäläinen <kimmo.hamalainen@nokia.com> | 2010-04-30 13:52:05 +0300 |
| commit | 0c8ef6d43756bbce25df9bbeb072941ed686a6cf (patch) | |
| tree | b3b047cbc747a1d0596d57226c7496c262bbcd1c /src/mdevicestate.h | |
| parent | b1123b675de2b9eca5db0cfd9f2ac52b6af7a082 (diff) | |
| parent | a98dcc2347c73e9141a27e4b884f1743ddd58a7e (diff) | |
Merge branch 'master' of git@gitorious.org:maemo-6-ui-framework/duicompositor
Conflicts:
src/mcompositemanager_p.h
src/mdevicestate.cpp
Diffstat (limited to 'src/mdevicestate.h')
| -rw-r--r-- | src/mdevicestate.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mdevicestate.h b/src/mdevicestate.h index f8cd432..ef924c4 100644 --- a/src/mdevicestate.h +++ b/src/mdevicestate.h @@ -57,7 +57,7 @@ class MDeviceState: public QObject public: - MDeviceState(); + MDeviceState(QObject* parent = 0); ~MDeviceState(); bool displayOff() const { return display_off; } |