summaryrefslogtreecommitdiff
path: root/src/xmlpatterns/api
Commit message (Collapse)AuthorAgeFilesLines
* QXmlName: Add copy constructor and use default for copy/assignmentv5.9.0-beta3Friedemann Kleint2017-04-202-5/+10
| | | | | | | | | | | | | | Fix Clang warning: 95:15: warning: definition of implicit copy constructor for 'QXmlName' is deprecated because it has a user-declared copy assignment operator qmetatype.h:1684:83: note: in instantiation of member function 'QtMetaTypePrivate::QMetaTypeFunctionHelper<QXmlName, true>::Construct' requested here qmetatype.h:1712:12: note: in instantiation of function template specialization 'qRegisterNormalizedMetaType<QXmlName>' requested here 134:1: note: in instantiation of function template specialization 'qRegisterMetaType<QXmlName>' requested here qmetatype.h:1848:34: note: expanded from macro 'Q_DECLARE_METATYPE' qmetatype.h:1860:35: note: expanded from macro 'Q_DECLARE_METATYPE_IMPL' qmetatype.h:765:32: note: implicit copy constructor for 'QXmlName' first required here Change-Id: I5e194201278d2a5d613eac9dc9cd7b36679697b3 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* Merge remote-tracking branch 'origin/5.8' into 5.9v5.9.0-beta2Liang Qi2017-04-122-14/+3
|\ | | | | | | Change-Id: Iad56858cfdc688957e7a8426f908ab0a641a3312
| * Cleanup implicit fallthroughs in xmlpatterns5.8Allan Sandfeld Jensen2017-03-302-14/+3
| | | | | | | | | | | | | | Use Q_FALLTHOUGH instead of comments, and use it consistently. Change-Id: Ieaf4867b612e624774011275b90cdd3678a29fe9 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* | Fix gcc 7 buildVille Voutilainen2017-04-121-0/+3
|/ | | | | | | | | We seem to get something that looks very much like a false positive for a maybe-uninitialized value. Disable -Wmaybe-uninitialized in the offending header file. Change-Id: If79bc7798df50f4dd0dcf63399213b4e4a7cdbd3 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Add feature xml-schemaFriedemann Kleint2016-10-251-2/+1
| | | | | | | Fix build warnings about missing qfeatures. Change-Id: I577b78fcf2037877f15d87006e279e61e4d86945 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-011-2/+2
|\ | | | | | | Change-Id: I0653ca8dd6a9b6ee2314911c7679a1c056dc3709
| * QXmlQuery: fix smart pointer typeMarc Mutz2016-07-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | m_resourceLoader is a QExplicitlySharedPointer<DeviceResourceLoader>, and ResourceDelegator inherits DeviceResourceLoader, but the newly-allocated object was constructed into a QExplicitlySharedPointer<ResourceLoader>. Benign, but wrong. Found while trying to compile the module without QT_ENABLE_QEXPLICITLYSHAREDDATAPOINTER_STATICCAST. Change-Id: I6f0e7bd50488ae6db6ab6c7022503332cd8523f1 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| * Correct return type of QXmlQueryPrivate::staticContext()Marc Mutz2016-07-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As reported by UBSan: qtbase/src/corelib/tools/qshareddata.h:167:13: runtime error: downcast of address 0x2ac9a801a410 which does not point to an object of type 'GenericStaticContext' 0x2ac9a801a410: note: object is of type 'QPatternist::StaticFocusContext' 00 00 00 00 28 95 b7 9d c9 2a 00 00 01 00 00 00 c9 2a 00 00 f0 a1 01 a8 c9 2a 00 00 70 fa 0b 02 ^~~~~~~~~~~~~~~~~~~~~~~ vptr for 'QPatternist::StaticFocusContext' I had no idea how the QExplicitlySharedDataPointer conversion could ever compile, until I saw that this module defines QT_ENABLE_QEXPLICITLYSHAREDDATAPOINTER_STATICCAST which is, of course, utterly broken. Change-Id: Ie392ba74438b6c75fde9fabe09f9b0e655489cd9 Reviewed-by: Tobias Koenig <tobias.koenig@kdab.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-073-3/+3
|\ \ | |/ | | | | Change-Id: Idb463224cc65c6337e0bc484f443470a88a48aa1
| * Make public headers compile with -Wzero-as-null-pointer-constantMarc Mutz2016-03-023-3/+3
| | | | | | | | | | | | | | | | | | | | | | ... or equivalent. QtBase 5.6 headers already compile that way, so let the other modules follow suit. Task-number: QTBUG-45291 Change-Id: Ia5d1ab50f82abad6e51bcd5883e22595eaaedc33 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1Liang Qi2016-02-151-14/+4
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I1c0ac322f30448a64b55b1ef60f60326ca0171a6
| * Fix QAbstractMessageHandler's docs regarding thread safetySergio Martins2016-01-151-14/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The QMutexLocker's usage was bogus, it didn't do any locking because it was being created as an anonymous temporary. It's too late in the game to fix the locking. The user's virtual function might have it's own locking to workaround this bug and might re-enter Qtxmlpatterns API causing a dead-lock. So instead, make the docs consistent with the current behavior. Change-Id: I4d2bdb1431b44262583abf48f795067ed37281d5 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* | Updated license headersAntti Kokko2016-01-2160-840/+1200
|/ | | | | | | | | | From Qt 5.7 -> LGPL v2.1 isn't an option anymore, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new LGPL header instead of LGPL21 one (in those files which will be under LGPL v3) Change-Id: I34265811e603ad9c5a7adcaab7791a521ae0ffb8 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* Doc: Fix linking issuesTopi Reinio2015-10-052-3/+3
| | | | | | | | | | | | | QXmlName has overloads for its functions, marked \internal, and QDoc fails to link to the public ones because it sees the internal ones first. As a workaround, exclude parentheses from the link - QDoc then uses a different code path which resolves the functions correctly. Change-Id: I0470cfd67c5d089ca586fd2debcb7b71c606a716 Reviewed-by: Nico Vertriest <nico.vertriest@digia.com>
* Make MergeIterator a trivial global static.Sergio Martins2015-05-301-7/+1
| | | | | | | | No need to initialize it before main. Change-Id: I2ebc9a2b04a58275570e967c17ace9028f11d5ba Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* Use QVector::reserve()Sergio Martins2015-05-281-2/+4
| | | | | | Change-Id: I86391bf0ede4fb32037b4e98889650e36ef5d279 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* Rename private header qdebug_p.h to qxmldebug_p.h.Friedemann Kleint2015-04-071-1/+1
| | | | | | | | | Avoid conflicts with the newly introduced qdebug_p.h of QtCore. Change-Id: I04b83e159900d9d36fa96ae5112eb4cdf75c0551 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* Update copyright headersJani Heikkinen2015-02-1760-419/+419
| | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I1dc468d4e08c2dfdc4643410220f18bc8ec450b9 Reviewed-by: Antti Kokko <antti.kokko@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-01-192-2/+2
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Id327fd1d5933b38c3fcc3f7e9edadb34aaf7a059
| * Doc: fix issues to display examples in Qt Creatorv5.4.15.4.1Leena Miettinen2015-01-052-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | - Add \brief commands to example docs to show descriptions - Add an examples page with the \group command - Link to the examples page from the module index page - Edit the .qdocconf file - Edit the .gitignore file to allow pushing changes to examples - Add a generic thumbnail image for C++ Code Analyzer example Change-Id: I1a313ae26664ce9fc50ef8962f0facd57dea546b Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Add support for QtInfoMsgKai Koehne2015-01-121-2/+2
| | | | | | | | | | | | | | | | | | Replace the generic default label by the new QtInfoMsg enum, which got added to Qt5Core. Change-Id: Ia56d24f29519d8f9c8f184d74b77292ecbb0bd4b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Add default label to QtMsgType switch statementKai Koehne2014-12-201-0/+1
| | | | | | | | | | | | | | | | | | This enables us to add a new QtInfoMsg message type to qtbase without breaking qtxmlpatterns. Change-Id: Ia4dcee9390eb6b7fc02cf10067317879e931a092 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-10-091-1/+1
|\ \ | |/ | | | | Change-Id: I4a853063ea9aaeb5d7055d4652be6faef468236e
| * Doc: Applied title case to section1 titlesv5.4.0-beta1Nico Vertriest2014-10-091-1/+1
| | | | | | | | | | | | Task-number: QTBUG-41250 Change-Id: I3155acb9a6813b0309de7fa0542f29c5a3a46b17 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-08-2860-1139/+659
|\ \ | |/ | | | | Change-Id: I8b1548b720d241259bb531b4742ac92d93788855
| * Update license headers and add new license filesAntti Kokko2014-08-2460-1139/+659
| | | | | | | | | | | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: If9208b9c90bcea35bbfe6b9c10db7803e97767e0 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* | Remove a wrong ###Lars Knoll2014-08-151-1/+0
|/ | | | | | Task-number: QTBUG-28940 Change-Id: I38c4af131d6056b42d564d20b3a1a5fd839b5b5b Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Add missing copy assignment operator to QXmlSchemaThiago Macieira2014-06-212-0/+12
| | | | | | | Found by MSVC 2013 when. Change-Id: I09c23afca4c9045523ae0722751fb27737b1b5f8 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Compile fix for WinRTMaurice Kalinowski2014-01-241-1/+1
| | | | | Change-Id: I1c9a9027ac4a592aaf6f34450ab6fbcf3224e47f Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* whitespace fixesOswald Buddenhagen2014-01-221-4/+4
| | | | | | | | remove trailing spaces & expand tabs Change-Id: Ic958087d8c50f3c51d767f5191e54c4079cc74a2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* make it possible to disable XML schema usagePeter Hartmann2013-11-151-7/+11
| | | | | | | | | | | | | | | | | | | | | | | Removing XML schema functionality reduces the size of libQt5XmlPatterns.so considerably: Linux desktop release mode: with XML schema: 4.3 MB without XML schema: 3.2 MB BlackBerry10 release mode: with XML schema: 2.6 MB without XML schema: 1.9 MB XML schema might not be used, especially on a mobile / embedded device, as opposed to the rest of xmlpatterns (e.g. XPath through QML XmlListModel). Task-number: QTBUG-28068 Change-Id: I5024a822179e7241e592f079efe3adef8f661c70 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* QAbstractXmlNodeModel: avoid undefined behaviorMarc Mutz2013-11-051-4/+2
| | | | | | | | | | | | | | | | | | | | | | | In 409655f3451815930b70a71baa175ab9f34467ed, the C-style cast was replaced by pointer arithmetic: char *null = 0; return null + offset; Says the standard (5.7 [expr.add]/5): When an expression that has integral type is added to or subtracted from a pointer, [...] If both the pointer operand and the result point to elements of the same array object, or one past the last element of the array object, the evaluation shall not produce an overflow; otherwise, the behavior is undefined. Iow: the above code has undefined behaviour. Fix by going back to the casting version, but using a C++ reinterpret_cast instead of a C-style one. Task-number: QTBUG-32735 Change-Id: Ia774491b13b1c52089daf63a7921b163fc93abce Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Revert "Handle new QtTraceMsg type, fix warnings about unhandled enumeration ↵Kai Koehne2013-11-051-2/+1
| | | | | | | | | | value." This reverts commit bf49d9f0d41c3be802dbdd2c23dfe7c5fd86f4b0. QtTraceMsg was removed from QtCore for the moment, too. Change-Id: I1d6aaacf5e363f81272da4fbb0a4ff12337dd677 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Handle new QtTraceMsg type, fix warnings about unhandled enumeration value.Friedemann Kleint2013-09-261-1/+2
| | | | | Change-Id: Ia908aa03e0f6a0e4f92013ae84fc68ac73919d08 Reviewed-by: hjk <hjk121@nokiamail.com>
* Replace use of C-style cast with something that is not a cast.old/5.1Thiago Macieira2013-08-161-3/+3
| | | | | | | | | Avoids a warning in user code. We should add -Wold-style-cast to our header checks. Task-number: QTBUG-32735 Change-Id: Ic284e3a5df56789d51484364b34a9ebc026bb20a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix warnings found by clang: private members unused in classesThiago Macieira2013-06-111-1/+0
| | | | | | | | | | | | These are private classes, so there's no need to keep binary compatibility or reserved members. qabstractxmlpullprovider_p.h:103:41: error: private field 'd' is not used [-Werror,-Wunused-private-field] projectedexpression_p.h:124:55: error: private field 'm_axis' is not used [-Werror,-Wunused-private-field] qprojectedexpression_p.h:154:41: error: private field 'm_right' is not used [-Werror,-Wunused-private-field] Change-Id: Idd46da87aaa85124b285cdcf01cf76eaa16e86c3 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-0559-59/+60
|\ | | | | | | Change-Id: I0e2f2023d576e479246ed86c6a95eba3c8b9d93b
| * Doc: Fix "Class QXmlNamePool has no \inmodule command"Sze Howe Koh2013-01-281-0/+1
| | | | | | | | | | | | | | All others in this folder use "\inmodule QtXmlPatterns" Change-Id: I460cba6b91a49e2af00ab909bea5af11919e8386 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Update copyright year in Digia's license headersSergio Ahumada2013-01-1059-59/+59
| | | | | | | | | | | | Change-Id: I5b7d4c1de139bebfff1b67d216c579835431e5d6 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Remove QT_{BEGIN,END}_HEADER macro usageSergio Ahumada2013-01-2832-111/+0
| | | | | | | | | | | | | | | | | | The macro was made empty in qtbase/ba3dc5f3b56d1fab6fe37fe7ae08096d7dc68bcb and is no longer necessary or used. Discussed-on: http://lists.qt-project.org/pipermail/development/2013-January/009284.html Change-Id: I74e76ed86361fbbf8957bf7a0540f2bd3350eb0a Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-01-041-2/+3
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: src/xmlpatterns/api/qcoloroutput_p.h src/xmlpatterns/schema/qxsdstatemachine_tpl_p.h sync.profile Change-Id: Ibf1d2ab42c4316d9fada397b1f1c0f37e65662dd
| * Fix annoying warning in qtxmlpatterns about a value too big for the enumThiago Macieira2013-01-021-2/+2
| | | | | | | | | | | | | | | | | | | | api/qcoloroutput_p.h:74:60: error: signed shift result (0xFFFFF00000) requires 41 bits to represent, but 'int' only has 32 bits [-Werror,-Wshift-overflow] The masks don't look right anyway. Let's just hardcode them according to how many colours are used. Change-Id: Idd3438ecab3fb666bd84929fb731011224b9c68e Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Fix the BackgroundMask again to prevent undefined behaviour.Erik Verbruggen2012-12-191-2/+2
| | | | | | | | | | Change-Id: I56b16845784a8679dbd67100024ac7acc3ddfba3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Fix compiler warning on shift overflow.Erik Verbruggen2012-12-171-1/+1
|/ | | | | | | | | | | In file included from /Users/erik/dev/qt5-stable/qtbase/include/QtXmlPatterns/5.0.0/QtXmlPatterns/private/qcoloroutput_p.h:1: /Users/erik/dev/qt5-stable/qtbase/include/QtXmlPatterns/5.0.0/QtXmlPatterns/private/../../../../../../qtxmlpatterns/src/xmlpatterns/api/qcoloroutput_p.h:74:60: warning: signed shift result (0xFFFFF00000) requires 41 bits to represent, but 'int' only has 32 bits [-Wshift-overflow] BackgroundMask = ((1 << BackgroundShift) - 1) << BackgroundShift ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~ Change-Id: Id8b1d9748dd94350d42889b36c61c163786beb38 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2460-1439/+1439
| | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I34508f293d75832657f79479e2a8c184e873e154 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Add qtxmlpatternsglobal.h containing the Q_XMLPATTERNS_EXPORT macroThiago Macieira2012-06-277-0/+73
| | | | | | | | No library other than the core libraries should depend on their export macros being in qglobal.h. Change-Id: Iecf077e39673eb4d64dd96b79fda2012490b6a59 Reviewed-by: Juha Vuolle <juha.vuolle@nokia.com>
* Fixed -qtnamespace compilation issues.Rohan McGovern2012-05-161-3/+3
| | | | | | | | Forward declaration of classes should come after QT_BEGIN_NAMESPACE, if the declared classes are expected to be inside the qtnamespace. Change-Id: Ifa7f2cbcd5ea9f5a0b2ade267c76d9e5e04d105a Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Doc: Fix \sa usageMarius Storm-Olsen2012-05-102-9/+8
| | | | | | | | Ensure comma between elements (4 missing), single space and curly- braces around title elements, etc. Change-Id: I7c6d5c31d00b30e48aa40455a66131843b3e70ee Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Use the new QUrl APIThiago Macieira2012-04-201-4/+4
| | | | | | | | | | | Use QByteArray::{from,to}PercentEncoding when operating directly on byte arrays. Don't use toEncoded/fromEncoded if the final source/destination is a QString -- QUrl's constructor and toString() are fine for that. Change-Id: I9349c2c6a12c43b8c5a4a4fca1fa796272ca90fa Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Fixed all qdoc errors for this module (except those related to linking)Arnab Datta2012-04-1311-30/+30
| | | | | Change-Id: I36d07a02ec8dea6bc2d538f32b28b987635c32c1 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
View Lorry Controller Status