diff options
author | axis <qt-info@nokia.com> | 2011-02-14 09:12:21 (GMT) |
---|---|---|
committer | Jason McDonald <jason.mcdonald@nokia.com> | 2011-02-15 09:45:20 (GMT) |
commit | 910b91f84275a59fdb3b5bc2fc26c48652cdeeb0 (patch) | |
tree | 6a85297bc7ae690b72f724c186816f1048d97a71 | |
parent | 637b89583c397a772ab4f0a8ad0a484ca062eaeb (diff) | |
download | Qt-910b91f84275a59fdb3b5bc2fc26c48652cdeeb0.zip Qt-910b91f84275a59fdb3b5bc2fc26c48652cdeeb0.tar.gz Qt-910b91f84275a59fdb3b5bc2fc26c48652cdeeb0.tar.bz2 |
Worked around a SC issue in S60 3.x vs 5.0 versions.
Task: QTBUG-16578
RevBy: Gareth Stockwell
(cherry picked from commit 984bc6626c4f290572ac721fd10edda99691306f)
-rw-r--r-- | src/gui/kernel/qwidget_s60.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/kernel/qwidget_s60.cpp index 1551162..af9ae47 100644 --- a/src/gui/kernel/qwidget_s60.cpp +++ b/src/gui/kernel/qwidget_s60.cpp @@ -54,7 +54,6 @@ #ifdef Q_WS_S60 #include <aknappui.h> -#include <akntoolbar.h> #include <eikbtgpc.h> #endif @@ -64,6 +63,19 @@ // CCoeControl objects until after the CONE event handler has finished running. Q_DECLARE_METATYPE(WId) +// Workaround for the fact that S60 SDKs 3.x do not contain the akntoolbar.h +// header, even though the documentation says that it should be there, and indeed +// it is present in the library. +class CAknToolbar : public CAknControl, + public MCoeControlObserver, + public MCoeControlBackground, + public MEikCommandObserver, + public MAknFadedComponent +{ +public: + IMPORT_C void SetToolbarVisibility(const TBool visible); +}; + QT_BEGIN_NAMESPACE extern bool qt_nograb(); |