summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@digia.com>2013-03-24 06:56:59 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-24 17:40:42 +0100
commit1a26da32559ceffa89003bcd5372419f27e8d847 (patch)
tree20e7d59bb26f7837630092ce9251c04160aab569
parentf275c054c3d833fe84bf8b87feca2137d7e984eb (diff)
parentfd8f4f6097ed05c169f6fcb058923adf99d4fe8f (diff)
downloadqtwebkit-examples-1a26da32559ceffa89003bcd5372419f27e8d847.tar.gz
Merge "Merge branch 'dev' into stable" into refs/staging/stable
-rw-r--r--examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.h b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.h
index 5d7f939..7913d83 100644
--- a/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.h
+++ b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.h
@@ -43,7 +43,6 @@
#include <QSimpleXmlNodeModel>
-QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
class QObject;
@@ -133,6 +132,4 @@ class QObjectXmlModel : public QSimpleXmlNodeModel
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif