summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Remove \ingroup all-examples command from the docsHEADdevJaishree Vyas2023-07-121-1/+0
| | | | | | Task-number: QTBUG-115044 Change-Id: I83314f3b7955e1ef9c857bcc96c07f6f90b2f875 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Use QT_DISABLE_DEPRECATED_UP_TO instead of QT_DISABLE_DEPRECATED_BEFOREIvan Solovev2022-08-221-1/+1
| | | | | | Task-number: QTBUG-104944 Change-Id: Iace1e08ce253977f068adc86b6a7a5b010369432 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Make sure all private headers include at least one otherThiago Macieira2022-03-0825-1/+29
| | | | | | | | | | See script in qtbase/util/includeprivate for the rules. Since these files are being touched anyway, I also ran the updatecopyright.pl script too. Change-Id: Ib056b47dde3341ef9a52ffff13ef677e471674b6 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Bump version to 6.4.0Jani Heikkinen2022-02-111-1/+1
| | | | | Change-Id: I625e37846d4a1d8ce0e53b8f27be860265b5a47f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version6.3.06.3Jani Heikkinen2021-09-141-1/+1
| | | | Change-Id: If1d616ee365fb8ce098edaa3f4fc8e832ff8e04a
* Bump version6.2.0Jani Heikkinen2021-05-241-1/+1
| | | | Change-Id: Ib12966c39085c3686beac997e51691b97963b29e
* Trust that Q_NO_TYPESAFE_FLAGS is no longer definedEdward Welbourne2021-05-041-4/+0
| | | | | | | | | It was introduced in 2003 during the transition to using QFlags. The transition is now safely completed. Change-Id: I29890202be10052896178502caaffbfd513424e7 Reviewed-by: Bernhard Rosenkränzer <bero@lindev.ch> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-083-1/+41
|\ | | | | | | Change-Id: If5721286fbb7c3dd0564f11e12311176477b92bb
| * Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-alpha1Qt Forward Merge Bot2020-02-050-0/+0
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I12424435f2a4c4f2b582c7acad18e0c57dfbd554
| | * Bump versionAlexandru Croitor2020-02-021-1/+1
| | | | | | | | | | | | Change-Id: Ie974007aa207364c2157bd7c90a6e79ef1718f9e
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-283-1/+41
| |\| | | | | | | | | | Change-Id: Ib8ba4718239d5b7690a20b50c6f49a055a0ea04f
| | * Merge remote-tracking branch 'origin/5.14.1' into 5.14Qt Forward Merge Bot2020-01-271-0/+20
| | |\ | | | | | | | | | | | | Change-Id: I3890885d75527dcb516efff1f2636b8a73500828
| | | * Add changes file for Qt 5.14.1v5.14.1Antti Kokko2020-01-091-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 089bdc0fcc1d87c6f5fe0835a4f723a6677e9a01 Catch invalid simple type that was causing a crash + 45ad1dc9c5f7330ea5d33cc8c8585d33b097e2e8 Enable auto tests run stand-alone + 7c8d1494dc06ff00508f512bdcf8153f21f348ff Add binary compatibility file for qtxmlpatterns 5.14 branch + b8c12ed8b1287462b897de76b7a9ad3ff5cc2194 Bump version Change-Id: Ia2156a2bcac6bc520162ef7e5d5fac2bd9acd028 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| | * | Doc: Fix regression caused by moving files around (leave no file behind)Paul Wicking2020-01-272-1/+21
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When xmllistmodel moved to xmlpatterns, an xml file quoted from in docs was unintentionally left behind. This adds the missing file, and corrects the file to quote from (which had since been adjusted to quote from the wrong file). Fixes: QTBUG-77176 Change-Id: I9cc871cf58dd33ce922fa0f6c5d86800210208c5 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | | Update dependencies on 'dev' in qt/qtxmlpatternsQt Submodule Update Bot2020-01-271-2/+2
| | | | | | | | | | | | | | | Change-Id: I371920bba638d369b3ea6515980f3103f2c2550a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtxmlpatternsQt Submodule Update Bot2020-01-221-2/+2
| | | | | | | | | | | | | | | Change-Id: I4472d146f723157f028b468deb46e3a8d77c5c80 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.15' into dev"Qt Forward Merge Bot2020-01-2129-360/+374
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-2129-360/+374
| |\| | | | | | | | | | | | | | Change-Id: Ia0f79b0c59c6339e471533b644f40995d8c4df37
| | * | Use QNetworkReply::networkError() instead of deprecated error()Timur Pocheptsov2020-01-152-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-80369 Change-Id: I6e71a6b888f292c283c85b6aeb3aa5804f032c91 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| | * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-300-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ieec8f7e562fc4c246a336402985cdb60f36b172f
| | | * Bump versionDaniel Smith2019-12-161-1/+1
| | | | | | | | | | | | | | | | Change-Id: I16747fabe937d18a437880acffa35bcd3e7e2a97
| | * | Bump Qt version to Qt 6Alexandru Croitor2019-12-201-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fix usage of text stream operators. Change-Id: I6c3ca0fe501f0565ecae5782a52cc70e1a4b6c04 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> (cherry picked from commit 2fc7a39180270c7551e99b918e827a93507e32a0) Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
| | * | Stop using SAX classes for writing XML in testsSona Kurazyan2019-12-187-184/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed the dependency of XMLWriter from QXmlContentHandler and QXmlLexicalHandler which are about to be deprecated. There's no need in inheriting from these interfaces, the tests call the methods of XMLWriter directly via XMLWriter instance. Task-number: QTBUG-76177 Change-Id: I2fe237b962774a004a9014f3dab1b5de5072f180 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| | * | Stop using SAX classes for reading XML filesSona Kurazyan2019-12-1819-171/+315
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The qtxmlpatterns' tests are using SAX classes for parsing XML files. These classes will be deprecated. Replaced QXmlSimpleReader by QDomDocument where applicable. For the test suite handlers inheriting from QXmlDefaultHandler, introduced the XmlParseHelper base class, which drives the parsing loop and allows overriding the methods for handling different XML tokens. Task-number: QTBUG-76177 Change-Id: Ia1a60c898a272906ede459e95ced7ec95d154fde Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| | * | Fix deprecation warnings about QHash::unite()Friedemann Kleint2019-12-183-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use QHash::insert() instead, fixing: schema/qxsdparticlechecker.cpp:467:83: warning: ‘QHash<K, V>& QHash<K, V>::unite(const QHash<K, V>&) is deprecated schema/qxsdschemachecker.cpp:108:39: warning: ‘QHash<K, V>& QHash<K, V>::unite(const QHash<K, V>&) is deprecated schema/qxsdschemaresolver.cpp:267:39: warning: ‘QHash<K, V>& QHash<K, V>::unite(const QHash<K, V>&) is deprecated Change-Id: I5ac3ee4f9a8103a9ce1210d6c369597c6b0abddc Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | | Update dependencies on 'dev' in qt/qtxmlpatternsQt Submodule Update Bot2020-01-201-2/+2
|/ / / | | | | | | | | | | | | Change-Id: Ie53e2ceb358a7a43b164749c371a247b5e8a905d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtxmlpatternsQt Submodule Update Bot2020-01-151-2/+2
| | | | | | | | | | | | | | | Change-Id: I1c69a5d7c2b4b5413e4be8d6e5fae58b62cc979a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-12-1731-40/+6253
|\| | | | | | | | | | | Change-Id: I96404d75682581891c8fb1c8ae610eeff6ece53d
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-1431-40/+6253
| |\| | | | | | | | | | Change-Id: Ief4b8ef19ad417bac23f4a4fe42e3b1c53455f03
| | * Merge remote-tracking branch 'origin/5.14.0' into 5.14Qt Forward Merge Bot2019-12-131-0/+18
| | |\ | | | | | | | | | | | | Change-Id: If025f51e601f4ec7f23e1fe51d698f9c20e67256
| | | * Add changes file for Qt 5.14.0v5.14.0-rc2v5.14.0-rc1v5.14.0Antti Kokko2019-11-261-0/+18
| | | | | | | | | | | | | | | | | | | | Change-Id: I00cdf3d22cdbad6d697ea5895e80b17a9e7506a5 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| | * | Add binary compatibility file for qtxmlpatterns 5.14 branchMilla Pohjanheimo2019-12-131-0/+6205
| | | | | | | | | | | | | | | | | | | | | | | | | | | | BC file built against 5.14.0 added. Change-Id: I1d29b035c0efa57424fca81aa6fd09c461281a08 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | Enable auto tests run stand-aloneFriedemann Kleint2019-12-0929-40/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the QtXmlPatternsSDK helper library to be a static library. Fixes: QTBUG-79802 Change-Id: I2f299fbcb73da155643a0b66a13a88745de6d00f Reviewed-by: Matti Paaso <matti.paaso@qt.io>
* | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-12-105-1/+76
|\| | | | | | | | | | | | | | | Change-Id: I3eb54f906dc1ee8fedf64a4cde67edb3f8ce5460
| * | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-075-1/+76
| |\| | | | | | | | | | | | | | Change-Id: I967a3678e5791457e25618e46611f6327e182c70
| | * | Catch invalid simple type that was causing a crashEdward Welbourne2019-12-045-1/+76
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Although the type passes a check that's supposed to find all types with a simple type, and appears to be of a simple type, its primitive type is apparently null. This was causing a segmentation fault. Apparently the code fails to correctly set the primitive type of a pattern-type instance of a union type. Document the known limitation by a QEXPECT_FAIL() in the test; I was unable to find where the primitive type should be set. Task-number: QTBUG-77620 Change-Id: I56b95ed815366c508f71b8af03b6f2a653d338c5 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | | Update dependencies on 'dev' in qt/qtxmlpatternsQt Submodule Update Bot2019-12-051-2/+2
| | | | | | | | | | | | | | | Change-Id: Ib3e73cd343f457326e4a04ec85ba9af1930ce985 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtxmlpatternsQt Submodule Update Bot2019-12-041-2/+2
| | | | | | | | | | | | | | | Change-Id: I0cef97090876ba836af9222e1019c8a72f8279e3 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-302-2/+2
|\| | | | | | | | | | | Change-Id: I76d2acc6e6189b94b951e28d3ceff93817a3bc1c
| * | Avoid initializing QFlags with 0 or nullptrFriedemann Kleint2019-11-252-2/+2
| | | | | | | | | | | | | | | | | | | | | It is being deprecated. Change-Id: I3c331ceb434f48939e4ce7e550c57df1b1794b17 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Update dependencies on 'dev' in qt/qtxmlpatternsQt Submodule Update Bot2019-11-291-2/+2
| | | | | | | | | | | | | | | Change-Id: I7e04361434c7e4f5a18ec30c33c77b9ca29a59b7 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtxmlpatternsQt Submodule Update Bot2019-11-281-2/+2
| | | | | | | | | | | | | | | Change-Id: Ib26501c76e78b25fe6655860f7af6df69463f133 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtxmlpatternsQt Submodule Update Bot2019-11-261-2/+2
| | | | | | | | | | | | | | | Change-Id: Ia4f43189aa6d8089f7bf0db2ddfa4a3c79f0107c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtxmlpatternsQt Submodule Update Bot2019-11-251-2/+2
| | | | | | | | | | | | | | | Change-Id: Iba6b94225822b6b5f4a9df656b061159d83d20ce Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-233-3/+13
|\| | | | | | | | | | | Change-Id: I928747197843381b430cc4b652a74740b28b033b
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-163-3/+13
| |\| | | | | | | | | | Change-Id: Icde6a1cc61662a8b55325727182d174cf17f8b1b
| | * Doc: Suppress unnecessary documentation warnings for \internal typesTopi Reinio2019-11-133-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add \internal commands to documented member functions of internal classes. Fixes: QTBUG-79819 Change-Id: I90a0b17df623fda350810c46ff3bc3421692f753 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | | Update dependencies on 'dev' in qt/qtxmlpatternsQt Submodule Update Bot2019-11-221-2/+2
| | | | | | | | | | | | | | | Change-Id: I05554c036c3cd38c0f90ed68a01da497131b76be Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtxmlpatternsQt Submodule Update Bot2019-11-131-2/+2
| | | | | | | | | | | | | | | Change-Id: I02180903b96844267f6b57ed32bc937427890618 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtxmlpatternsQt Submodule Update Bot2019-11-121-2/+2
| | | | | | | | | | | | | | | Change-Id: I7581792dd09d209f1bc05c69cafc36ff7c518380 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>