diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-19 10:54:41 +0100 |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-19 10:55:15 +0100 |
commit | 9c97fb67430b16392343ccbf6d2ef3b45d7614b2 (patch) | |
tree | 6a7c1b48a63e0288f35246bd594a7b7ff4621ee0 /tools/xmlpatterns/qapplicationargument_p.h | |
parent | 4dde2b75a3ff9896b1ffb503a4929c65b273c048 (diff) | |
parent | d8608214913963aa209978d9fbbc5d3c041dcff2 (diff) | |
download | qtxmlpatterns-9c97fb67430b16392343ccbf6d2ef3b45d7614b2.tar.gz |
Merge branch 'dev' into stable
This starts Qt 5.1 release cycle
Change-Id: I521b815a7f8c7ae439186c842f01efcdee744b0d
Diffstat (limited to 'tools/xmlpatterns/qapplicationargument_p.h')
-rw-r--r-- | tools/xmlpatterns/qapplicationargument_p.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/xmlpatterns/qapplicationargument_p.h b/tools/xmlpatterns/qapplicationargument_p.h index 22b0a53..640f3df 100644 --- a/tools/xmlpatterns/qapplicationargument_p.h +++ b/tools/xmlpatterns/qapplicationargument_p.h @@ -54,7 +54,6 @@ #include <QtCore/QVariant> -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QString; @@ -96,6 +95,6 @@ private: uint qHash(const QApplicationArgument &argument); QT_END_NAMESPACE -QT_END_HEADER + #endif |