diff options
| author | axis <qt-info@nokia.com> | 2009-07-10 07:34:59 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-07-10 07:34:59 (GMT) |
| commit | db1364d48341cb5449755dfc34efc8c0ee2655c0 (patch) | |
| tree | d949d5c8357cedda31c4e52bd21f7981a037ce3c /src/gui/kernel/qapplication.cpp | |
| parent | aa46e5928b8fd97bada814e56134adb23a068b24 (diff) | |
| parent | 7c21c773d736d86f3c5c4f5c42dd49da17a11ef7 (diff) | |
| download | Qt-db1364d48341cb5449755dfc34efc8c0ee2655c0.zip Qt-db1364d48341cb5449755dfc34efc8c0ee2655c0.tar.gz Qt-db1364d48341cb5449755dfc34efc8c0ee2655c0.tar.bz2 | |
Merge branch 'fixing_tst_qdatetimeedit'
Conflicts:
src/gui/kernel/qkeysequence.cpp
Diffstat (limited to 'src/gui/kernel/qapplication.cpp')
| -rw-r--r-- | src/gui/kernel/qapplication.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp index 04cdcd2..e61b17e 100644 --- a/src/gui/kernel/qapplication.cpp +++ b/src/gui/kernel/qapplication.cpp @@ -5098,6 +5098,8 @@ uint QApplicationPrivate::currentPlatform(){ platform |= KB_Gnome; if (X11->desktopEnvironment == DE_CDE) platform |= KB_CDE; +#elif defined(Q_WS_S60) + platform = KB_S60; #endif return platform; } |