diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-19 10:41:05 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-19 10:41:47 +0100 |
| commit | fd8f4f6097ed05c169f6fcb058923adf99d4fe8f (patch) | |
| tree | cdd9a320e3dd6020a1d05a90d404aff5085e2b0b | |
| parent | ee74b8c84b9f435ede3bf81d1de4508dad088546 (diff) | |
| parent | 2787eb059134ed289f3ad7c386a1501e0ddd6e9c (diff) | |
| download | qtwebkit-examples-fd8f4f6097ed05c169f6fcb058923adf99d4fe8f.tar.gz | |
Merge branch 'dev' into stable
This starts Qt 5.1 release cycle
Change-Id: I23e1f8d68c66460c83e2a42007f24aa96d4032fd
| -rw-r--r-- | examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.h | 3 |
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 |