diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-04-27 09:06:43 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-04-27 09:06:43 (GMT) |
| commit | d17fb5cad878d1dbe144cfd7f02c6cb4d3db2677 (patch) | |
| tree | 261ca3ad03972da54e1e4df2ef70d79015edc9aa /tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.cpp | |
| parent | e26f32ef8e1480f80e362059cc03c4b5a7fb92e9 (diff) | |
| parent | 001d46dffc6240da27634ef9e27b47f768587253 (diff) | |
| download | Qt-d17fb5cad878d1dbe144cfd7f02c6cb4d3db2677.zip Qt-d17fb5cad878d1dbe144cfd7f02c6cb4d3db2677.tar.gz Qt-d17fb5cad878d1dbe144cfd7f02c6cb4d3db2677.tar.bz2 | |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Diffstat (limited to 'tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.cpp')
| -rw-r--r-- | tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.cpp b/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.cpp index ecdaf16..09394e7 100644 --- a/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.cpp +++ b/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.cpp @@ -48,9 +48,7 @@ #include <QtGui/QToolButton> #include <QtGui/QStyle> -#if QT_VERSION >= 0x040400 QT_BEGIN_NAMESPACE -#endif class QtButtonPropertyBrowserPrivate { @@ -626,8 +624,6 @@ bool QtButtonPropertyBrowser::isExpanded(QtBrowserItem *item) const return false; } -#if QT_VERSION >= 0x040400 QT_END_NAMESPACE -#endif #include "moc_qtbuttonpropertybrowser.cpp" |