diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-04-07 09:55:11 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-04-07 09:55:11 (GMT) |
| commit | 757e9af177544eaf6b66641ea724716ccd4b2701 (patch) | |
| tree | 84aab0e4c7141b7a25db40838b9cf27829ff9fe8 /src/gui/styles/qgtkstyle_p.h | |
| parent | eeccdc0cec9a616e740e3b59a6f011bfe703ce09 (diff) | |
| parent | 6947390e5d331ae653e91acecad70108915328e7 (diff) | |
| download | Qt-757e9af177544eaf6b66641ea724716ccd4b2701.zip Qt-757e9af177544eaf6b66641ea724716ccd4b2701.tar.gz Qt-757e9af177544eaf6b66641ea724716ccd4b2701.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/gui/styles/qgtkstyle_p.h')
| -rw-r--r-- | src/gui/styles/qgtkstyle_p.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gui/styles/qgtkstyle_p.h b/src/gui/styles/qgtkstyle_p.h index 5bb7550..68a04e9 100644 --- a/src/gui/styles/qgtkstyle_p.h +++ b/src/gui/styles/qgtkstyle_p.h @@ -85,9 +85,14 @@ public: int size() const { return m_size; } const char *data() const { return m_data; } +#ifdef __SUNPRO_CC + QHashableLatin1Literal(const char* str) + : m_size(strlen(str)), m_data(str) {} +#else template <int N> QHashableLatin1Literal(const char (&str)[N]) : m_size(N - 1), m_data(str) {} +#endif QHashableLatin1Literal(const QHashableLatin1Literal &other) : m_size(other.m_size), m_data(other.m_data) |