summaryrefslogtreecommitdiffstats
path: root/tools/shared/qtpropertybrowser/qtpropertybrowser.h
diff options
context:
space:
mode:
authorKent Hansen <khansen@trolltech.com>2009-04-17 15:04:23 (GMT)
committerKent Hansen <khansen@trolltech.com>2009-04-17 15:04:23 (GMT)
commitc29533ab2094c38bb63d50dd6306cfe6ccacc868 (patch)
treee539b2062c870dd431f522d1d1e0677008eaa717 /tools/shared/qtpropertybrowser/qtpropertybrowser.h
parentf15b8a83e2e51955776a3f07cb85ebfc342dd8ef (diff)
parent198efeb27e5c2a87d0a2bb6859446cb1faf45ed8 (diff)
downloadQt-c29533ab2094c38bb63d50dd6306cfe6ccacc868.zip
Qt-c29533ab2094c38bb63d50dd6306cfe6ccacc868.tar.gz
Qt-c29533ab2094c38bb63d50dd6306cfe6ccacc868.tar.bz2
Merge branch 'kinetic-animations' into kinetic-statemachine
Diffstat (limited to 'tools/shared/qtpropertybrowser/qtpropertybrowser.h')
-rw-r--r--tools/shared/qtpropertybrowser/qtpropertybrowser.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/tools/shared/qtpropertybrowser/qtpropertybrowser.h b/tools/shared/qtpropertybrowser/qtpropertybrowser.h
index 649a9e3..20ffb81 100644
--- a/tools/shared/qtpropertybrowser/qtpropertybrowser.h
+++ b/tools/shared/qtpropertybrowser/qtpropertybrowser.h
@@ -45,11 +45,7 @@
#include <QtGui/QWidget>
#include <QtCore/QSet>
-#if QT_VERSION >= 0x040400
QT_BEGIN_NAMESPACE
-#endif
-
-
class QtAbstractPropertyManager;
class QtPropertyPrivate;
@@ -308,8 +304,6 @@ private:
};
-#if QT_VERSION >= 0x040400
QT_END_NAMESPACE
-#endif
#endif // QTPROPERTYBROWSER_H