summaryrefslogtreecommitdiffstats
path: root/tools/shared/qtpropertybrowser/qtpropertybrowserutils_p.h
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2009-04-17 10:53:44 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2009-04-17 10:53:44 (GMT)
commit160252d5d1facf2a53af1314836f22fb00784625 (patch)
treee1a6a0be850671e32af0306ffd8b0c4a780da720 /tools/shared/qtpropertybrowser/qtpropertybrowserutils_p.h
parentfd73185195633fd97228a0c832c247b761967598 (diff)
parentcfa04d53ff58d45d7811637c8be76099740d25c5 (diff)
downloadQt-160252d5d1facf2a53af1314836f22fb00784625.zip
Qt-160252d5d1facf2a53af1314836f22fb00784625.tar.gz
Qt-160252d5d1facf2a53af1314836f22fb00784625.tar.bz2
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts: tests/auto/qpainterpath/tst_qpainterpath.cpp
Diffstat (limited to 'tools/shared/qtpropertybrowser/qtpropertybrowserutils_p.h')
-rw-r--r--tools/shared/qtpropertybrowser/qtpropertybrowserutils_p.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/tools/shared/qtpropertybrowser/qtpropertybrowserutils_p.h b/tools/shared/qtpropertybrowser/qtpropertybrowserutils_p.h
index 2eab3c8..fe8c6d1 100644
--- a/tools/shared/qtpropertybrowser/qtpropertybrowserutils_p.h
+++ b/tools/shared/qtpropertybrowser/qtpropertybrowserutils_p.h
@@ -58,9 +58,7 @@
#include <QtGui/QWidget>
#include <QtCore/QStringList>
-#if QT_VERSION >= 0x040400
QT_BEGIN_NAMESPACE
-#endif
class QMouseEvent;
class QCheckBox;
@@ -154,8 +152,6 @@ private:
QLineEdit *m_lineEdit;
};
-#if QT_VERSION >= 0x040400
QT_END_NAMESPACE
-#endif
#endif