From 5508d25baa41d4d16e58b0bdd3365a4eab54c734 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sun, 11 Jun 2017 17:32:05 -0700 Subject: Fix GCC 7 warning about fallthrough Change-Id: Ia53158e207a94bf49489fffd14c738808be5a6b9 Reviewed-by: Alex Blasche --- src/xmlpatterns/data/qderivedinteger_p.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/xmlpatterns/data/qderivedinteger_p.h b/src/xmlpatterns/data/qderivedinteger_p.h index 71e21ad..bd700fc 100644 --- a/src/xmlpatterns/data/qderivedinteger_p.h +++ b/src/xmlpatterns/data/qderivedinteger_p.h @@ -602,7 +602,7 @@ namespace QPatternist case TypeShort: Q_ASSERT_X(false, Q_FUNC_INFO, "It makes no sense to call this function, see Numeric::toUnsignedInteger()."); - /* Fallthrough all these. */ + Q_FALLTHROUGH(); /* Fallthrough all these. */ case TypeUnsignedByte: case TypeUnsignedInt: case TypeUnsignedLong: -- cgit v1.2.1 From 55bf61b68b42a79548bf1bf1358981d40cf75911 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Mon, 19 Jun 2017 10:08:01 +0300 Subject: Add Qt 5.9.1 changes file Change-Id: I03f77fbbcdbba123634896f76e10500b1506eafd Reviewed-by: Friedemann Kleint --- dist/changes-5.9.1 | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 dist/changes-5.9.1 diff --git a/dist/changes-5.9.1 b/dist/changes-5.9.1 new file mode 100644 index 0000000..60a7de0 --- /dev/null +++ b/dist/changes-5.9.1 @@ -0,0 +1,24 @@ +Qt 5.9.1 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.9.0. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +http://doc.qt.io/qt-5/index.html + +The Qt version 5.9 series is binary compatible with the 5.8.x series. +Applications compiled for 5.8 will continue to run with 5.9. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* Library * +**************************************************************************** + +- This release contains only minor code improvements. -- cgit v1.2.1 From 988fb7ba66b1c9ab014de625b5037203b3516495 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 2 Dec 2016 23:40:33 -0800 Subject: Fix compilation error with ICC 17: it doesn't like auto and comma The error is a warning upgraded via -Werror and the message doesn't even make sense to me: error #3373: nonstandard use of "auto" to both deduce the type from an initializer and to announce a trailing return type Intel-Issue-ID: 6000164202 Change-Id: I73fa1e59a4844c43a109fffd148caf09a1952e92 Reviewed-by: Thiago Macieira --- src/xmlpatterns/schema/qxsdstatemachine_tpl_p.h | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/xmlpatterns/schema/qxsdstatemachine_tpl_p.h b/src/xmlpatterns/schema/qxsdstatemachine_tpl_p.h index 2583bb9..1cb2e72 100644 --- a/src/xmlpatterns/schema/qxsdstatemachine_tpl_p.h +++ b/src/xmlpatterns/schema/qxsdstatemachine_tpl_p.h @@ -111,7 +111,9 @@ template void XsdStateMachine::reset() { // reset the machine to the start state - for (auto it = m_states.cbegin(), end = m_states.cend(); it != end; ++it) { + auto it = m_states.cbegin(); + auto end = m_states.cend(); + for ( ; it != end; ++it) { if (it.value() == StartState || it.value() == StartEndState) { m_currentState = it.key(); return; @@ -175,7 +177,9 @@ bool XsdStateMachine::proceed(InputType input) // fetch the transition entry for the current state const QHash > &entry = m_transitions[m_currentState]; - for (auto it = entry.cbegin(), end = entry.cend(); it != end; ++it) { + auto it = entry.cbegin(); + auto end = entry.cend(); + for ( ; it != end; ++it) { if (inputEqualsTransition(input, it.key())) { m_currentState = it.value().first(); m_lastTransition = it.key(); @@ -212,7 +216,9 @@ TransitionType XsdStateMachine::lastTransition() const template typename XsdStateMachine::StateId XsdStateMachine::startState() const { - for (auto it = m_states.cbegin(), end = m_states.cend(); it != end; ++it) { + auto it = m_states.cbegin(); + auto end = m_states.cend(); + for ( ; it != end; ++it) { if (it.value() == StartState || it.value() == StartEndState) return it.key(); } @@ -339,7 +345,9 @@ XsdStateMachine XsdStateMachine::toDFA() const // search the start state as the algorithm starts with it... StateId startState = -1; - for (auto it = m_states.cbegin(), end = m_states.cend(); it != end; ++it) { + auto it = m_states.cbegin(); + auto end = m_states.cend(); + for ( ; it != end; ++it) { if (it.value() == StartState) { startState = it.key(); break; -- cgit v1.2.1 From 1dc7a444e24ff13ebbc3747fd9be5ee6bfd3e430 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 20 Jun 2017 10:50:53 +0200 Subject: qxquerytokenizer.cpp: Fix -Wimplicit-fallthrough Remove the Q_ASSERT following the return statements in the switch. Fixes numerous warnings: parser\qxquerytokenizer.cpp:825:28: warning: this statement may fall through [-Wimplicit-fallthrough=] Q_ASSERT(false); Change-Id: I921b4a61f7751f7a55c708ed182806e76e7d75e7 Reviewed-by: Thiago Macieira --- src/xmlpatterns/parser/qxquerytokenizer.cpp | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/src/xmlpatterns/parser/qxquerytokenizer.cpp b/src/xmlpatterns/parser/qxquerytokenizer.cpp index a88e2d1..ab1cfdc 100644 --- a/src/xmlpatterns/parser/qxquerytokenizer.cpp +++ b/src/xmlpatterns/parser/qxquerytokenizer.cpp @@ -821,8 +821,6 @@ Tokenizer::Token XQueryTokenizer::nextToken() } else return id; - - Q_ASSERT(false); } case NamespaceDecl: { @@ -848,8 +846,6 @@ Tokenizer::Token XQueryTokenizer::nextToken() return tokenAndChangeState(t->token, Default, 0); else return nc; - - Q_ASSERT(false); } case Axis: { @@ -1428,9 +1424,6 @@ Tokenizer::Token XQueryTokenizer::nextToken() return id; } } - - Q_ASSERT(false); - } case VarName: { @@ -1439,7 +1432,6 @@ Tokenizer::Token XQueryTokenizer::nextToken() setState(Operator); return tokenizeNCNameOrQName(); - Q_ASSERT(false); } case ItemType: { @@ -1476,7 +1468,6 @@ Tokenizer::Token XQueryTokenizer::nextToken() return name; } } - Q_ASSERT(false); } case KindTest: { @@ -1521,7 +1512,6 @@ Tokenizer::Token XQueryTokenizer::nextToken() } else return nc; - Q_ASSERT(false); } case KindTestForPI: { @@ -1538,7 +1528,6 @@ Tokenizer::Token XQueryTokenizer::nextToken() default: return tokenizeNCName(); } - Q_ASSERT(false); } case OccurrenceIndicator: { @@ -1556,7 +1545,6 @@ Tokenizer::Token XQueryTokenizer::nextToken() return nextToken(); } } - Q_ASSERT(false); } case XQueryVersion: { @@ -1579,7 +1567,6 @@ Tokenizer::Token XQueryTokenizer::nextToken() return tokenAndChangeState(keyword->token, Default); else return id; - Q_ASSERT(false); } case StartTag: { @@ -1629,7 +1616,6 @@ Tokenizer::Token XQueryTokenizer::nextToken() default: return tokenizeNCNameOrQName(); } - Q_ASSERT(false); } case AposAttributeContent: case QuotAttributeContent: @@ -1765,7 +1751,6 @@ Tokenizer::Token XQueryTokenizer::nextToken() ++m_pos; } - Q_ASSERT(false); } case ElementContent: { @@ -1918,7 +1903,6 @@ Tokenizer::Token XQueryTokenizer::nextToken() } ++m_pos; } - Q_ASSERT(false); } case ProcessingInstructionName: { @@ -1937,7 +1921,6 @@ Tokenizer::Token XQueryTokenizer::nextToken() ProcessingInstructionContent); } } - Q_ASSERT(false); } case ProcessingInstructionContent: { @@ -1956,7 +1939,6 @@ Tokenizer::Token XQueryTokenizer::nextToken() popState(); return Token(T_PI_CONTENT, normalizeEOL(m_data.mid(start, len), CharacterSkips())); } - Q_ASSERT(false); } case EndTag: { @@ -1970,7 +1952,6 @@ Tokenizer::Token XQueryTokenizer::nextToken() } else return tokenizeNCNameOrQName(); - Q_ASSERT(false); } case XMLComment: { @@ -1992,7 +1973,6 @@ Tokenizer::Token XQueryTokenizer::nextToken() else return error(); } - Q_ASSERT(false); } case Pragma: { -- cgit v1.2.1 From 6dc19f7408e8302600234a294752615ee69ad9cb Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 30 Jun 2017 09:52:13 +0200 Subject: Bump version Change-Id: Ib8fb4def07fd5961958967d8abea700e1dd3572a --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index d860bee..e1c4e49 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) CONFIG += warning_clean DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.9.1 +MODULE_VERSION = 5.9.2 -- cgit v1.2.1 From 54e7255eb18b1247d7cfda2d6bc120dc9c0f119b Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 20 Jul 2017 13:32:03 -0700 Subject: Autotest: adapt to qt_error_string() now returning Win32 messages Instead of Unix "No such file or directory". Change-Id: I84e45059a888497fb55ffffd14d32409773e38fe Reviewed-by: Simon Hausmann --- tests/auto/xmlpatterns/tst_xmlpatterns.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp index 8db61b9..e2f7337 100644 --- a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp +++ b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp @@ -33,6 +33,10 @@ #include "../qxmlquery/TestFundament.h" #include "../network-settings.h" +#ifdef Q_OS_WIN +# include +#endif + /*! \class tst_XmlPatterns \internal @@ -1043,6 +1047,12 @@ QString tst_XmlPatterns::filterStderr(const QString &in) for (const QRegExp& rx : irrelevant) out = out.remove(rx); +#ifdef Q_OS_WIN + // replace some Win32 error messages by standard Unix ones + out.replace(qt_error_string(ERROR_FILE_NOT_FOUND), "No such file or directory"); + out.replace(qt_error_string(ERROR_PATH_NOT_FOUND), "No such file or directory"); +#endif + return out; } -- cgit v1.2.1