summaryrefslogtreecommitdiff
path: root/src/xmlpatterns
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-01-043-7/+7
|\ | | | | | | | | | | | | | | | | Conflicts: src/xmlpatterns/api/qcoloroutput_p.h src/xmlpatterns/schema/qxsdstatemachine_tpl_p.h sync.profile Change-Id: Ibf1d2ab42c4316d9fada397b1f1c0f37e65662dd
| * Fix warnings found in qtxmlpatterns by ClangThiago Macieira2013-01-024-14/+14
| | | | | | | | | | | | | | | | | | schema/qxsdstatemachine_tpl_p.h:186:71: error: unused parameter 'input' [-Werror,-Wunused-parameter] expr/qexpression.cpp:139:50: error: unused variable 'end' [-Werror,-Wunused-variable] projection/qdocumentprojector_p.h:84:22: error: 'QPatternist::DocumentProjector::attribute' hides overloaded virtual function [-Werror,-Woverloaded-virtual] Change-Id: I84021e4aa6bdca8dfcaa4c375845ceb24c33818b Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * 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>
| * remove obsolete DEPENDPATH assignmentsv5.0.0Oswald Buddenhagen2012-12-161-2/+0
| | | | | | | | | | | | | | | | qmake now adds CONFIG+=depend_includepath by default, making manual DEPENDPATH setup unnecessary. Change-Id: Ibe763804b4cd451f19bfdac660436772644bf285 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * QtXmlPatterns: Doc: Fix links to designer manualDavid Schulz2012-12-071-1/+1
| | | | | | | | | | Change-Id: Ifbcf2769c8212eb289759d64b9637106792a948d Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
| * Doc: Edited qdocconf file to produce correct QCH titles.Jerome Pasion2012-12-031-2/+3
| | | | | | | | | | | | Task-number: QTBUG-28341 Change-Id: I35301f8e29ee8502d4cd77b2ebf0f043eb59ab91 Reviewed-by: Kai Koehne <kai.koehne@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 warnings: hiding overloaded virtual functions.Erik Verbruggen2012-12-172-12/+12
| | | | | | | | | | Change-Id: Id966e4780cfc792d2902c226e70e7d26eafd06a8 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Fix compiler warning about unused parameters.Erik Verbruggen2012-12-171-0/+3
| | | | | | | | | | Change-Id: Ib9f6f371698f50397ad3a646703657d0e016dfe1 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Fix compiler warning: remove unused variables.Erik Verbruggen2012-12-171-2/+0
| | | | | | | | | | Change-Id: I8d42e918cab045b0541ab3aad7b9bc98e78a3cd1 Reviewed-by: Lars Knoll <lars.knoll@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 copyright information from Nokia to DigiaSergio Ahumada2012-11-281-2/+2
| | | | | Change-Id: Ic2e32ec9bf39448b6dc51da856359a1cfc6e00c8 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Doc: Modularized Qt XML Patterns documentation.Jerome Pasion2012-11-2384-1/+3701
| | | | | | | | | | | | | -moved snippets, images, documentation to src/xmlpatterns -fixed \snippet tag -ported module information from qtdoc repository -enabled "make docs" for the module -set up qdocconf file and .index file -updated tests/auto/patternistexamples to point to the new snippet locations Change-Id: Ifd10733c277c6dbacac42898c8e7bacd00d23f27 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix XmlListModel memory leakAri Koivisto2012-10-145-8/+8
| | | | | | | | | | | | This is a forward port of a memory leak fix committed to Qt 4.8 (QTBUG-15191). The fix includes all changes except changes to qitem_p.h which has changed in Qt 5.0. Additionally fix qxmlquery autotest failure introduced in the original Qt 4.8 patch. Task-number: QTBUG-27357 Change-Id: Ia0e916d9d6bccea014d28920cef48d6e47e8f04f Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Update docs after modularization of docsTor Arne Vestbø2012-10-111-2/+2
| | | | | | | | The global files now live in qtbase only, and are made available to the other modules via the $QT_INSTALL_DOCS variable. Change-Id: I0f4408c5ac71f33833101fd88fbc84ed2ee092fd Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-24725-17504/+17504
| | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I34508f293d75832657f79479e2a8c184e873e154 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* centralize load(qt_build_config)s in .qmake.confOswald Buddenhagen2012-09-111-2/+0
| | | | | Change-Id: Ide097efe50d6d1d4b42ef6980c83f3e9ad7d2ba1 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Use QMAKE_DOCSv5.0.0-beta1J-P Nurmi2012-08-221-0/+2
| | | | | Change-Id: I565956b9e2ae59a0f30ac1672570078beaa708ba Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* follow rename of qt_module_config.prf to qt_module.prfOswald Buddenhagen2012-08-111-1/+1
| | | | | Change-Id: I68a1c748066da20557b43beab3cdb98d1b1bb53e Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.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>
* build system cleanupsOswald Buddenhagen2012-06-271-9/+4
| | | | | | | | | | | | | | | - load(qt_module) => load(qt_build_config) - remove: - CONFIG+=module (obsolete) - setup of PKGCONFIG* variables (automated now) - code relating to module version headers (automated now) - %mastercontent assignment (automated now) - QT_BUILD_*_LIB defines (automated now) - pointless QPRO_PWD assignments Change-Id: Ie8a638b3c3a1a6a3d37fc410435bbc2b4a068ecf Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* auto-generate module prisOswald Buddenhagen2012-06-271-1/+0
| | | | | | Change-Id: I358b29978987885eb46c8e1032a9d86b3014cb52 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* change naming convention for template source filesOswald Buddenhagen2012-06-2728-14/+14
| | | | | | | | | rename *.cpp => *_tpl_p.h otherwise, syncqt doesn't generate code to install them, which makes the "regular" private headers which include the template code useless. Change-Id: I7f3a34bf442fb003bcb7ef96dd4f88d47bd6598b Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* QtXmlPatterns: Fix compiler warnings.Friedemann Kleint2012-05-251-2/+2
| | | | | | | | | | QString conversions, assigned/unused variables, braces around ambiguous else. Also fixed coding style in the affected lines to make the sanity bot happy. Change-Id: I85e440861ec9e8177a6cf9a017dc981a25212f54 Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* Fixed -qtnamespace compilation issues.Rohan McGovern2012-05-169-22/+22
| | | | | | | | 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>
* Explicitly enable exceptionsLars Knoll2012-05-101-1/+1
| | | | | | | | | | Exceptions can be disabled implicitly on some platforms or when configuring with -no-exceptions. Make sure we explicitly enable them for this module as it uses them internally. Change-Id: I17cf730a8afdd5b7d1700c9ab3104e131a095936 Reviewed-by: Thiago Macieira <thiago.macieira@intel.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>
* Change remaining uses of {to,from}Ascii to {to,from}Latin1 [other]Thiago Macieira2012-05-033-7/+7
| | | | | | | | | | This operation should be a no-op anyway, since at this point in time, the fromAscii and toAscii functions simply call their fromLatin1 and toLatin1 counterparts. Task-number: QTBUG-21872 Change-Id: Ib84e307f486cb3049f0b61a667caa40799394f86 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Don't use the QRegExp methods that modify the objectThiago Macieira2012-04-2411-23/+23
| | | | | | | | | | | | | | QRegExp matching methods modify the object, which we don't want to. In particular, when we receive a QRegExp from the user or we store in a context that might require thread-safety, make sure we make a copy before using it. QRegularExpression has no such shortcoming. Task-number: QTBUG-25064 Change-Id: I2c4d5f4b60d6b3569568103cd7107cd2adaa3ae8 Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Use the new QUrl APIThiago Macieira2012-04-202-7/+6
| | | | | | | | | | | 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>
* Use a QMap instead of a QHash for the regexp flagsThiago Macieira2012-04-201-1/+1
| | | | | | | | | | This is unit-tested, so we need a predictable order. Therefore, we can't use QHash anymore. Besides, this is just for 4 elements, so there shouldn't be a perceptible overhead. Change-Id: I878f77982e8070f3bc30bd2458e26e61b22f313d Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com> Reviewed-by: Toby Tomkins <toby.tomkins@nokia.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>
* Update QtXmlPatterns module name in documentationqt-v5.0.0-alpha1Honglei Zhang2012-03-224-13/+13
| | | | | | | | | | According to new module name convention, QtXmlPatterns is replaced with Qt XML Patterns in all documentation. Task-number: QTBUG-24775 Change-Id: I3bb3fffc29836dc1cd0e798dca48bfd9e2089821 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Tagged the following files as part of the QtXmlPatterns moduleArnab Datta2012-03-1614-3/+16
| | | | | Change-Id: Ib63e31c1105779f01764f32936007216c79655e6 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Remove the usage of deprecated qdoc macros.Casper van Donderen2012-03-058-96/+96
| | | | | | | | | | QDoc now has support for Doxygen style commands for italics, bold and list items. This change applies that change in QDoc to the actual documentation. Task-number: QTBUG-24578 Change-Id: I453169a7222ee741f8d9a10b6c063be5d15f1b76 Reviewed-by: Honglei Zhang <honglei.zhang@nokia.com>
* Fix for commit f42f82f435d738339ad85c1380d1167338517247Sami Rosendahl2012-02-021-0/+4
| | | | | | | | | | | Qt5 change I758df57551ec49ce8c8b357794177b4e6c454d2f had mistakenly removed intialization of QXmlItem::m_atomicValue from QXmlItem::QXmlItem(const QVariant &atomicValue) constructor in a special case. This commit restores the initialization. Change-Id: I5ddc12bf0ff5d1d365471bb09d4eb3cdadd01b9b Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Fix QUrl handling after QUrl changes.David Faure2012-02-023-4/+5
| | | | | | | | | toString() is fine for most usages but here the result is made part of XML bits, so toEncoded() is necessary so that '<' and '>' are percent-encoded. Change-Id: I41832cefe3ae12cab13531f17095d0804a2e86d9 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix access to uninitialized values in QtXmlPatternsSami Rosendahl2012-02-013-33/+14
| | | | | | | | | | | | | | | | | | | | | | | Fixes valgrind warning like below when executing tst_QXmlQuery::copyConstructor() Conditional jump or move depends on uninitialised value(s) at: QPatternist::NodeIndexStorage::operator!=(QPatternist::NodeIndexStorage const&) const (qabstractxmlnodemodel.cpp:1220) by: QXmlItem::operator=(QXmlItem const&) (qabstractxmlnodemodel.cpp:1228) Reason for the warning is that QPatternist::NodeIndexStorage::operator!= accesses all fields of NodeIndexStorage, which are all not intialized in every execution path of QXmlItem::QXmlItem(const QVariant &) and class QPatternist::Item constructors. Fixed by adding NodeIndexStorage::reset() function that resets all fields and put a call to that function where NodeIndexStorage objects were previously incompletely initialized. Note that unfortunately class NodeIndexStorage cannot have a default constructor, because it is used as a union field. Change-Id: I758df57551ec49ce8c8b357794177b4e6c454d2f Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Dmitry Trofimov Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Make method non-inline as Symbian support is gone.Holger Hans Peter Freyther2012-01-312-7/+7
| | | | | | | | | | The comment mentions that this method is inlined to work around a compiler bug. We do not support this compiler anymore, move the definition back to the .cpp file. Change-Id: I0052b0616bdd997fd35b3b544563c07f865e66c5 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
* Purge the Symbian support from this moduleHolger Hans Peter Freyther2012-01-311-2/+0
| | | | | | | | | | This continues were 70e6c71f7e8e4c12672075e7477f4f1d99f320e6 stopped and removes Symbian support from the .pro files and the examples. Change-Id: I760645d6e19cccb50d505340c3a08bacc7190105 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-31724-727/+727
| | | | | | | | | | | As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ie14feff161cca83c53750e22a6204d34c3cba52c Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix delete/free mismatch in QtXmlPatternsSami Rosendahl2012-01-271-1/+1
| | | | | | | | | | | | | | Fixes valgrind warning like this: Mismatched free() / delete / delete [] at: operator delete(void*) (vg_replace_malloc.c:387) by: QPatternist::Decimal::toString(double) (qdecimal.cpp:121) Reason for the warning is that toString above calls qdtoa the result of which should be released with free(), not delete. Change-Id: Iff07f2d07a4d65c642167fd07b980c6bdd15c117 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Update obsolete contact address.Jason McDonald2012-01-23724-727/+727
| | | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: I4a78fc4951be48d46135f4a5e0072bd1a8061ea9 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Stop treating text files as binary files in git diffs.Jason McDonald2012-01-231-4/+0
| | | | | | Change-Id: I2d4db4f0a2363113a11e064a8005a72a25991d69 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove the use of QT_MODULE()Gunnar Sletta2012-01-1915-15/+0
| | | | | | Change-Id: Ia7b8143861c9e57c8f947b4c746958f0b0140410 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Update copyright year in license headers.Jason McDonald2012-01-10108-108/+108
| | | | | | | | The previous commit missed some outdated license headers from 2008. Change-Id: I82c1a0aa4c133195094b00c26e8579e03b85c798 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update copyright year in license headers.Jason McDonald2012-01-09616-619/+619
| | | | | | Change-Id: Iba74aff1aba680f7b56314f3acae3478be9d3e56 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* QtXmlPatterns: Fix warnings about unused variables.Friedemann Kleint2011-12-012-3/+3
| | | | | | | | Patternist::Exception is a bool, no need to catch by const &. Change-Id: I73012eee1fc8540c405e771723b953841655e084 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Honglei Zhang <honglei.zhang@nokia.com>
* Fix compile warnings about assigned/unused variables.Friedemann Kleint2011-11-303-4/+1
| | | | | | Change-Id: I75cbbea2777f2359fa4d86fd28057dd16bc02feb Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Make private headers usable, and use them in the tests.Rohan McGovern2011-11-11326-843/+843
| | | | | | | | | | | | | The xmlpatterns private headers were not including each other correctly, making them unusable unless the source directory was available and in INCLUDEPATH. Fix it so that the private headers include each other by <private/...>, allowing them to work for an installed Qt. Change-Id: I9c7cbad219ed141c356d9ea097e67e0fb2fa550c Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
View Lorry Controller Status