diff options
author | David Boddie <dboddie@trolltech.com> | 2009-09-04 13:12:40 (GMT) |
---|---|---|
committer | David Boddie <dboddie@trolltech.com> | 2009-09-04 13:12:40 (GMT) |
commit | e15ab744f15127422ef62a0b70e6cf129f52f48f (patch) | |
tree | 72352e1e297f0322610234c2eeb994820407616e /src/gui/kernel/qt_s60_p.h | |
parent | 04802c1fe74439111c7bbe92fcb777dcbd618500 (diff) | |
parent | b3b9813f1083fc556aea1f952329551da97aee90 (diff) | |
download | Qt-e15ab744f15127422ef62a0b70e6cf129f52f48f.zip Qt-e15ab744f15127422ef62a0b70e6cf129f52f48f.tar.gz Qt-e15ab744f15127422ef62a0b70e6cf129f52f48f.tar.bz2 |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui/kernel/qt_s60_p.h')
-rw-r--r-- | src/gui/kernel/qt_s60_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/kernel/qt_s60_p.h b/src/gui/kernel/qt_s60_p.h index 78301af..ea1ca69 100644 --- a/src/gui/kernel/qt_s60_p.h +++ b/src/gui/kernel/qt_s60_p.h @@ -95,6 +95,7 @@ public: int screenHeightInTwips; int defaultDpiX; int defaultDpiY; + int qtOwnsS60Environment : 1; static inline void updateScreenSize(); static inline RWsSession& wsSession(); static inline RWindowGroup& windowGroup(); |