|
[-]
[+]
|
Changed |
_service:tar_git:qt5-qtxmlpatterns.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:qtxmlpatterns.spec
^
|
|
|
|
|
Changed |
_service
^
|
|
[-]
[+]
|
Changed |
_service:tar_git:qt5-qtxmlpatterns-5.2.1+git1.tar.bz2/qtxmlpatterns/.qmake.conf
^
|
| @@ -1,4 +1,5 @@
load(qt_build_config)
CONFIG += qt_example_installs
+CONFIG += warning_clean
-MODULE_VERSION = 5.2.0
+MODULE_VERSION = 5.2.1
|
|
[-]
[+]
|
Changed |
_service:tar_git:qt5-qtxmlpatterns-5.2.1+git1.tar.bz2/qtxmlpatterns/examples/xmlpatterns/filetree/filetree.cpp
^
|
| @@ -276,13 +276,13 @@
/*!
No order is defined for this example, so we always return
- QXmlNodeModelIndex::Precedes, just to keep everyone happy.
+ QXmlNodeModelIndex::Is, just to keep everyone happy.
*/
QXmlNodeModelIndex::DocumentOrder
FileTree::compareOrder(const QXmlNodeModelIndex&,
const QXmlNodeModelIndex&) const
{
- return QXmlNodeModelIndex::Precedes;
+ return QXmlNodeModelIndex::Is;
}
/*!
|
|
[-]
[+]
|
Changed |
_service:tar_git:qt5-qtxmlpatterns-5.2.1+git1.tar.bz2/qtxmlpatterns/examples/xmlpatterns/xmlpatterns.pro
^
|
| @@ -1,6 +1,11 @@
TEMPLATE = subdirs
SUBDIRS += xquery
-qtHaveModule(widgets): SUBDIRS += filetree schema recipes
+qtHaveModule(widgets) {
+ SUBDIRS += recipes
+
+ load(qfeatures)
+ !contains(QT_DISABLED_FEATURES, xmlschema): SUBDIRS += filetree schema
+}
EXAMPLE_FILES = \
shared
|
|
[-]
[+]
|
Changed |
_service:tar_git:qt5-qtxmlpatterns-5.2.1+git1.tar.bz2/qtxmlpatterns/src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp
^
|
| @@ -308,12 +308,6 @@
return retrieveDocument(uri, ReportContext::Ptr());
}
-static inline uint qHash(const QPair<QUrl, QString> &desc)
-{
- /* Probably a lousy hash. */
- return qHash(desc.first) + qHash(desc.second);
-}
-
bool AccelTreeResourceLoader::retrieveUnparsedText(const QUrl &uri,
const QString &encoding,
const ReportContext::Ptr &context,
|
|
[-]
[+]
|
Changed |
_service:tar_git:qt5-qtxmlpatterns-5.2.1+git1.tar.bz2/qtxmlpatterns/src/xmlpatterns/api/api.pri
^
|
| @@ -23,10 +23,6 @@
$$PWD/qxmlquery_p.h \
$$PWD/qxmlresultitems.h \
$$PWD/qxmlresultitems_p.h \
- $$PWD/qxmlschema.h \
- $$PWD/qxmlschema_p.h \
- $$PWD/qxmlschemavalidator.h \
- $$PWD/qxmlschemavalidator_p.h \
$$PWD/qxmlserializer.h \
$$PWD/qxmlserializer_p.h \
$$PWD/qcoloringmessagehandler_p.h \
@@ -50,9 +46,17 @@
$$PWD/qxmlnamepool.cpp \
$$PWD/qxmlquery.cpp \
$$PWD/qxmlresultitems.cpp \
- $$PWD/qxmlschema.cpp \
- $$PWD/qxmlschema_p.cpp \
- $$PWD/qxmlschemavalidator.cpp \
$$PWD/qxmlserializer.cpp \
$$PWD/qcoloringmessagehandler.cpp \
$$PWD/qcoloroutput.cpp
+
+load(qfeatures)
+!contains(QT_DISABLED_FEATURES, xmlschema) {
+ HEADERS += $$PWD/qxmlschema.h \
+ $$PWD/qxmlschema_p.h \
+ $$PWD/qxmlschemavalidator.h \
+ $$PWD/qxmlschemavalidator_p.h
+ SOURCES += $$PWD/qxmlschema.cpp \
+ $$PWD/qxmlschema_p.cpp \
+ $$PWD/qxmlschemavalidator.cpp
+}
|
|
[-]
[+]
|
Changed |
_service:tar_git:qt5-qtxmlpatterns-5.2.1+git1.tar.bz2/qtxmlpatterns/src/xmlpatterns/parser/qquerytransformparser.cpp
^
|
| @@ -39,27 +39,34 @@
**
****************************************************************************/
-/* A Bison parser, made by GNU Bison 2.3a. */
-
-/* Skeleton implementation for Bison's Yacc-like parsers in C
-
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
- Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the Qt API. It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+
+/* A Bison parser, made by GNU Bison 2.5. */
+
+/* Bison implementation for Yacc-like parsers in C
+
+ Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
+
+ This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* As a special exception, you may create a larger work that contains
part or all of the Bison parser skeleton and distribute that work
@@ -70,7 +77,7 @@
special exception, which will cause the skeleton and the resulting
Bison output files to be licensed under the GNU General Public
License without this special exception.
-
+
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
@@ -88,7 +95,7 @@
#define YYBISON 1
/* Bison version. */
-#define YYBISON_VERSION "2.3a"
+#define YYBISON_VERSION "2.5"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
@@ -96,109 +103,167 @@
/* Pure parsers. */
#define YYPURE 1
+/* Push parsers. */
+#define YYPUSH 0
+
+/* Pull parsers. */
+#define YYPULL 1
+
/* Using locations. */
#define YYLSP_NEEDED 1
/* Substitute the variable and function names. */
-#define yyparse XPathparse
-#define yylex XPathlex
-#define yyerror XPatherror
-#define yylval XPathlval
-#define yychar XPathchar
-#define yydebug XPathdebug
-#define yynerrs XPathnerrs
-#define yylloc XPathlloc
+#define yyparse XPathparse
+#define yylex XPathlex
+#define yyerror XPatherror
+#define yylval XPathlval
+#define yychar XPathchar
+#define yydebug XPathdebug
+#define yynerrs XPathnerrs
+#define yylloc XPathlloc
/* Copy the first part of user declarations. */
-/* Line 164 of yacc.c. */
-#line 22 "querytransformparser.ypp"
+
+/* Line 268 of yacc.c */
+#line 52 "querytransformparser.ypp"
+
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtXmlPatterns module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the Qt API. It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
#include <limits>
#include <QUrl>
-#include "qabstractfloat_p.h"
-#include "qandexpression_p.h"
-#include "qanyuri_p.h"
-#include "qapplytemplate_p.h"
-#include "qargumentreference_p.h"
-#include "qarithmeticexpression_p.h"
-#include "qatomicstring_p.h"
-#include "qattributeconstructor_p.h"
-#include "qattributenamevalidator_p.h"
-#include "qaxisstep_p.h"
-#include "qbuiltintypes_p.h"
-#include "qcalltemplate_p.h"
-#include "qcastableas_p.h"
-#include "qcastas_p.h"
-#include "qcombinenodes_p.h"
-#include "qcommentconstructor_p.h"
-#include "qcommonnamespaces_p.h"
-#include "qcommonsequencetypes_p.h"
-#include "qcommonvalues_p.h"
-#include "qcomputednamespaceconstructor_p.h"
-#include "qcontextitem_p.h"
-#include "qcopyof_p.h"
-#include "qcurrentitemstore_p.h"
-#include "qdebug_p.h"
-#include "qdelegatingnamespaceresolver_p.h"
-#include "qdocumentconstructor_p.h"
-#include "qelementconstructor_p.h"
-#include "qemptysequence_p.h"
-#include "qemptysequencetype_p.h"
-#include "qevaluationcache_p.h"
-#include "qexpressionfactory_p.h"
-#include "qexpressionsequence_p.h"
-#include "qexpressionvariablereference_p.h"
-#include "qexternalvariablereference_p.h"
-#include "qforclause_p.h"
-#include "qfunctioncall_p.h"
-#include "qfunctionfactory_p.h"
-#include "qfunctionsignature_p.h"
-#include "qgeneralcomparison_p.h"
|
|
[-]
[+]
|
Changed |
_service:tar_git:qt5-qtxmlpatterns-5.2.1+git1.tar.bz2/qtxmlpatterns/src/xmlpatterns/parser/qquerytransformparser_p.h
^
|
| @@ -49,27 +49,24 @@
//
// We mean it.
-/* A Bison parser, made by GNU Bison 2.3a. */
+/* A Bison parser, made by GNU Bison 2.5. */
-/* Skeleton interface for Bison's Yacc-like parsers in C
-
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
- Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify
+/* Bison interface for Yacc-like parsers in C
+
+ Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
+
+ This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* As a special exception, you may create a larger work that contains
part or all of the Bison parser skeleton and distribute that work
@@ -80,7 +77,7 @@
special exception, which will cause the skeleton and the resulting
Bison output files to be licensed under the GNU General Public
License without this special exception.
-
+
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
@@ -116,25 +113,6 @@
# undef MAP
#endif
-/* These tokens are defined to nothing on Windows because they're
- * used in their documentation parser, for use in things like:
- *
- * int foo(IN char* name, OUT char* path);
- *
- * Hence this un-break fix. Note that this file was auto generated. */
-#ifdef IN
-# undef IN
-#endif
-#ifdef INSTANCE
-# undef INSTANCE
-#endif
-#ifdef STRICT
-# undef STRICT
-#endif
-#ifdef SELF
-# undef SELF
-#endif
-
/* Tokens. */
#ifndef YYTOKENTYPE
# define YYTOKENTYPE
|
|
[-]
[+]
|
Changed |
_service:tar_git:qt5-qtxmlpatterns-5.2.1+git1.tar.bz2/qtxmlpatterns/src/xmlpatterns/parser/querytransformparser.ypp
^
|
| @@ -406,7 +406,7 @@
if(e)
{
- parseInfo->staticContext->error(QtXmlPatterns::tr("A template by name %1 "
+ parseInfo->staticContext->error(QtXmlPatterns::tr("A template with name %1 "
"has already been declared.")
.arg(formatKeyword(parseInfo->staticContext->namePool(),
name)),
@@ -1470,7 +1470,7 @@
Encoding: /* empty */ /* [X] */
| ENCODING StringLiteral
{
- QRegExp encNameRegExp(QLatin1String("[A-Za-z][A-Za-z0-9._\\-]*"));
+ const QRegExp encNameRegExp(QLatin1String("[A-Za-z][A-Za-z0-9._\\-]*"));
if(!encNameRegExp.exactMatch($2))
{
@@ -2063,7 +2063,7 @@
allowedIn(QXmlQuery::XQuery10, parseInfo, @$, $3);
if(variableByName($5, parseInfo))
{
- parseInfo->staticContext->error(QtXmlPatterns::tr("A variable by name %1 has already "
+ parseInfo->staticContext->error(QtXmlPatterns::tr("A variable with name %1 has already "
"been declared.")
.arg(formatKeyword(parseInfo->staticContext->namePool()->toLexical($5))),
parseInfo->isXSLT() ? ReportContext::XTSE0630 : ReportContext::XQST0049,
@@ -2103,7 +2103,7 @@
else
{
parseInfo->staticContext->error(QtXmlPatterns::tr("No value is available for the external "
- "variable by name %1.")
+ "variable with name %1.")
.arg(formatKeyword(parseInfo->staticContext->namePool(), $5)),
parseInfo->isXSLT() ? ReportContext::XTDE0050 : ReportContext::XPDY0002,
fromYYLTYPE(@$, parseInfo));
@@ -2280,7 +2280,7 @@
{
if((*it)->name() == $3->name())
{
- parseInfo->staticContext->error(QtXmlPatterns::tr("An argument by name %1 has already "
+ parseInfo->staticContext->error(QtXmlPatterns::tr("An argument with name %1 has already "
"been declared. Every argument name "
"must be unique.")
.arg(formatKeyword(parseInfo->staticContext->namePool(), $3->name())),
@@ -3710,7 +3710,7 @@
$$ = create(func, @$, parseInfo);
else
{
- parseInfo->staticContext->error(QtXmlPatterns::tr("No function by name %1 is available.")
+ parseInfo->staticContext->error(QtXmlPatterns::tr("No function with name %1 is available.")
.arg(formatKeyword(parseInfo->staticContext->namePool(), $1)),
ReportContext::XPST0017, fromYYLTYPE(@$, parseInfo));
}
@@ -3987,7 +3987,7 @@
&ryy, true);
if(declaredAttributes.contains(att))
{
- parseInfo->staticContext->error(QtXmlPatterns::tr("An attribute by name %1 has already appeared on this element.")
+ parseInfo->staticContext->error(QtXmlPatterns::tr("An attribute with name %1 has already appeared on this element.")
.arg(formatKeyword(parseInfo->staticContext->namePool(), att)),
ReportContext::XQST0040, fromYYLTYPE(@$, parseInfo));
|
|
[-]
[+]
|
Changed |
_service:tar_git:qt5-qtxmlpatterns-5.2.1+git1.tar.bz2/qtxmlpatterns/src/xmlpatterns/parser/qxslttokenizer.cpp
^
|
| @@ -697,8 +697,6 @@
if(att.qualifiedName() == QLatin1String("xml:space"))
{
- const QStringRef val(m_currentAttributes.value(CommonNamespaces::XML, QLatin1String("space")));
-
/* We raise an error if the value is not recognized.
*
* Extensible Markup Language (XML) 1.0 (Fourth Edition), 2.10
|
|
[-]
[+]
|
Changed |
_service:tar_git:qt5-qtxmlpatterns-5.2.1+git1.tar.bz2/qtxmlpatterns/src/xmlpatterns/xmlpatterns.pro
^
|
| @@ -20,7 +20,11 @@
include($$PWD/janitors/janitors.pri)
include($$PWD/parser/parser.pri)
include($$PWD/projection/projection.pri)
-include($$PWD/schema/schema.pri)
+
+load(qfeatures)
+!contains(QT_DISABLED_FEATURES, xmlschema) {
+ include($$PWD/schema/schema.pri)
+}
include($$PWD/type/type.pri)
include($$PWD/utils/utils.pri)
include($$PWD/qobjectmodel/qobjectmodel.pri, "", true)
|
|
[-]
[+]
|
Changed |
_service:tar_git:qt5-qtxmlpatterns-5.2.1+git1.tar.bz2/qtxmlpatterns/tests/auto/auto.pro
^
|
| @@ -21,19 +21,23 @@
qxmlnodemodelindex \
qxmlquery \
qxmlresultitems \
- qxmlschema \
- qxmlschemavalidator \
qxmlserializer \
xmlpatterns \
xmlpatternsdiagnosticsts \
- xmlpatternsschema \
- xmlpatternsschemats \
xmlpatternssdk \
xmlpatternsvalidator \
xmlpatternsview \
xmlpatternsxqts \
xmlpatternsxslts \
+load(qfeatures)
+!contains(QT_DISABLED_FEATURES, xmlschema) {
+ SUBDIRS += qxmlschema \
+ qxmlschemavalidator \
+ xmlpatternsschema \
+ xmlpatternsschemats
+}
+
xmlpatternsdiagnosticsts.depends = xmlpatternssdk
xmlpatternsview.depends = xmlpatternssdk
xmlpatternsxslts.depends = xmlpatternssdk
|
|
[-]
[+]
|
Changed |
_service:tar_git:qt5-qtxmlpatterns-5.2.1+git1.tar.bz2/qtxmlpatterns/tools/tools.pro
^
|
| @@ -1,2 +1,9 @@
TEMPLATE = subdirs
-!android|android_app: SUBDIRS += xmlpatterns xmlpatternsvalidator
+
+load(qfeatures)
+!android|android_app {
+ SUBDIRS += xmlpatterns
+ !contains(QT_DISABLED_FEATURES, xmlschema) {
+ SUBDIRS += xmlpatternsvalidator
+ }
+}
|
