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 /src/xmlpatterns/janitors | |
| 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 'src/xmlpatterns/janitors')
| -rw-r--r-- | src/xmlpatterns/janitors/qargumentconverter_p.h | 4 | ||||
| -rw-r--r-- | src/xmlpatterns/janitors/qatomizer_p.h | 4 | ||||
| -rw-r--r-- | src/xmlpatterns/janitors/qcardinalityverifier_p.h | 4 | ||||
| -rw-r--r-- | src/xmlpatterns/janitors/qebvextractor_p.h | 4 | ||||
| -rw-r--r-- | src/xmlpatterns/janitors/qitemverifier_p.h | 4 | ||||
| -rw-r--r-- | src/xmlpatterns/janitors/quntypedatomicconverter_p.h | 4 |
6 files changed, 0 insertions, 24 deletions
diff --git a/src/xmlpatterns/janitors/qargumentconverter_p.h b/src/xmlpatterns/janitors/qargumentconverter_p.h index f8d53a6..ded57f5 100644 --- a/src/xmlpatterns/janitors/qargumentconverter_p.h +++ b/src/xmlpatterns/janitors/qargumentconverter_p.h @@ -54,8 +54,6 @@ #include <private/quntypedatomicconverter_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE namespace QPatternist @@ -98,6 +96,4 @@ namespace QPatternist QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/xmlpatterns/janitors/qatomizer_p.h b/src/xmlpatterns/janitors/qatomizer_p.h index dc23a90..af70180 100644 --- a/src/xmlpatterns/janitors/qatomizer_p.h +++ b/src/xmlpatterns/janitors/qatomizer_p.h @@ -55,8 +55,6 @@ #include <private/qitem_p.h> #include <private/qsinglecontainer_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE namespace QPatternist @@ -105,6 +103,4 @@ namespace QPatternist QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/xmlpatterns/janitors/qcardinalityverifier_p.h b/src/xmlpatterns/janitors/qcardinalityverifier_p.h index 5ce9b75..1ffc97f 100644 --- a/src/xmlpatterns/janitors/qcardinalityverifier_p.h +++ b/src/xmlpatterns/janitors/qcardinalityverifier_p.h @@ -54,8 +54,6 @@ #include <private/qsinglecontainer_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE namespace QPatternist @@ -123,6 +121,4 @@ namespace QPatternist QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/xmlpatterns/janitors/qebvextractor_p.h b/src/xmlpatterns/janitors/qebvextractor_p.h index 0f7084b..4ba62cd 100644 --- a/src/xmlpatterns/janitors/qebvextractor_p.h +++ b/src/xmlpatterns/janitors/qebvextractor_p.h @@ -54,8 +54,6 @@ #include <private/qsinglecontainer_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE namespace QPatternist @@ -104,6 +102,4 @@ namespace QPatternist QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/xmlpatterns/janitors/qitemverifier_p.h b/src/xmlpatterns/janitors/qitemverifier_p.h index ef4498a..a331372 100644 --- a/src/xmlpatterns/janitors/qitemverifier_p.h +++ b/src/xmlpatterns/janitors/qitemverifier_p.h @@ -54,8 +54,6 @@ #include <private/qsinglecontainer_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE namespace QPatternist @@ -98,6 +96,4 @@ namespace QPatternist QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/xmlpatterns/janitors/quntypedatomicconverter_p.h b/src/xmlpatterns/janitors/quntypedatomicconverter_p.h index 86c1638..0b8288d 100644 --- a/src/xmlpatterns/janitors/quntypedatomicconverter_p.h +++ b/src/xmlpatterns/janitors/quntypedatomicconverter_p.h @@ -56,8 +56,6 @@ #include <private/qsinglecontainer_p.h> #include <private/qcastingplatform_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE namespace QPatternist @@ -122,6 +120,4 @@ namespace QPatternist QT_END_NAMESPACE -QT_END_HEADER - #endif |