diff options
| author | mread <qt-info@nokia.com> | 2010-06-30 16:21:05 (GMT) |
|---|---|---|
| committer | mread <qt-info@nokia.com> | 2010-07-01 08:34:48 (GMT) |
| commit | 8c14529abdbbaa32c7d4f9d84b97515ab759223e (patch) | |
| tree | 3433489bc5734ebcbd80457380ff6af7e8ae4367 /src/gui/styles/qs60style.h | |
| parent | fabf804b147892abb0e8aeb49d1753359ea5e56e (diff) | |
| download | Qt-8c14529abdbbaa32c7d4f9d84b97515ab759223e.zip Qt-8c14529abdbbaa32c7d4f9d84b97515ab759223e.tar.gz Qt-8c14529abdbbaa32c7d4f9d84b97515ab759223e.tar.bz2 | |
Stub version of QS60Style
Added a stub version of QS60Style so that DEF files can be compatible
between Qt configured with and without style-s60.
Reviewed-by: Shane Kearns
Diffstat (limited to 'src/gui/styles/qs60style.h')
| -rw-r--r-- | src/gui/styles/qs60style.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/gui/styles/qs60style.h b/src/gui/styles/qs60style.h index c878538..f588d9f 100644 --- a/src/gui/styles/qs60style.h +++ b/src/gui/styles/qs60style.h @@ -50,8 +50,6 @@ QT_BEGIN_NAMESPACE QT_MODULE(Gui) -#if !defined(QT_NO_STYLE_S60) - //Public custom pixel metrics values. //These can be used to fetch custom pixel metric value from outside QS60Style. enum { @@ -91,14 +89,14 @@ public: #endif bool event(QEvent *e); -#ifndef Q_WS_S60 +#ifndef Q_OS_SYMBIAN static QStringList partKeys(); static QStringList colorListKeys(); void setS60Theme(const QHash<QString, QPicture> &parts, const QHash<QPair<QString , int>, QColor> &colors); bool loadS60ThemeFromBlob(const QString &blobFile); bool saveS60ThemeToBlob(const QString &blobFile) const; -#endif // !Q_WS_S60 +#endif // !Q_OS_SYMBIAN protected Q_SLOTS: QIcon standardIconImplementation( @@ -113,8 +111,6 @@ private: friend class QApplicationPrivate; }; -#endif // QT_NO_STYLE_S60 - QT_END_NAMESPACE QT_END_HEADER |