summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Adding configuration files for documentation buildMichalina Ziemba2012-01-115-0/+242
| | | | | | | | | | -added qdocconf, pri file, and stylesheet -modified project file Change-Id: I56b341b96c05fdafe8f0521bb28a7bb1ffc3288e Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gary Aish <gary.aish@nokia.com> Reviewed-by: Honglei Zhang <honglei.zhang@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-09796-799/+799
| | | | | | Change-Id: Iba74aff1aba680f7b56314f3acae3478be9d3e56 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* QtXmlPatterns-test: Use QFINDTESTDATA to locate test data.Friedemann Kleint2011-12-224-4/+38
| | | | | | | | | | Introduce QFINDTESTDATA and set the current directory of the process to the test directory such that it works indepently of the working directory of executable location. Change-Id: I8105ba0fa7d9da7ff920d10f3a083433e2590e9f Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Honglei Zhang <honglei.zhang@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>
* Fix sanity check of network test serverJason McDonald2011-11-304-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some of Qt's autotests depend on access to a test server. For each test that used the test server, tests/auto/network-settings.h created a global object to verify at startup that host lookups to the test server will succeed (and abort the test otherwise). There are two problems with that approach: First, the sanity check happens before main(), and thus before the test framework has started logging test results. This means that if the sanity check aborts the test, the failure message will not be visible in the test output if logging to a file or will cause the output to be malformed if logging to the console in XML format. Second, since Qt 4.7, the host lookup uses a class that connects to the QCoreApplication instance, which doesn't exist before main(), and this caused all tests that included network-settings.h to output an error message from QObject::connect() at the beginning of the test. Both of these problems are solved by removing the global object from network-settings.h and instead performing the sanity check in the initTestCase() function of each test. Task-number: QTBUG-22876 Change-Id: I1ae004cf7a10a02d34d7ec517ef5515eb722aecf Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove needless include from xmlpatternsvalidator test.Jason McDonald2011-11-301-1/+0
| | | | | | | | Nothing from network-settings.h is used in this test. Change-Id: I78454610cf1289658ec370234ee3eefa5720ae82 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-11346-952/+936
| | | | | | | | | | | | | 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>
* Temporary skip xmlquery test on MacHonglei Zhang2011-11-111-0/+2
| | | | | | | | | | | xquerySupport generates lots of "select: Invalid argument" on Mac environment. This should be checked. The test case should pass on Mac later when there is more resource on xmlpatterns. Bug report QTBUG-22556 is created to get it fixed. Change-Id: Iad37d21b84e7539e104a2b4595531b8ad9a58b07 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix test compilation on Windows.Friedemann Kleint2011-10-211-1/+1
| | | | | Change-Id: Iad81e6c7908ba1f931c8634cb1c16649999a864c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Remove SkipMode parameter from QSKIP.Jason McDonald2011-10-215-17/+15
| | | | | | | | | The SkipMode parameter has been removed from the API in qtbase, so it must be in all calls to QSKIP. Task-number: QTBUG-21851, QTBUG-21652 Change-Id: I8f5d6488637acd5e38d3c8dd418ff3776b2f3778 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* tests: explicitly put the path to xmlpatterns toolsRohan McGovern2011-10-142-8/+17
| | | | | | | | | | | Previously, these tests used whatever version of the xmlpatterns tools happened to be first in PATH, which was quite error-prone. QLibraryInfo can tell us exactly where the binaries are supposed to be located, so use that instead. Change-Id: I556ffe1819560afbe6a8bfa5272fcf2a760a14f7 Reviewed-on: http://codereview.qt-project.org/2799 Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
* Remove dead code from autotests.Jason McDonald2011-10-1233-151/+5
| | | | | | | | | | | tests/auto/xmlpatterns.pri ensured that QTEST_XMLPATTERNS was always defined, so the preprocessor directives using this define were redundant. Change-Id: Id21d8b5cc4586ce0e92c1ee4a22c582eb3f76245 Reviewed-on: http://codereview.qt-project.org/6493 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix compilation of patternistexamples autotest.Jason McDonald2011-10-111-10/+10
| | | | | | | | | | This test had a number of incorrect relative paths for including snippets. Change-Id: I85061fb119faf6aff19225316d15a917746cd761 Reviewed-on: http://codereview.qt-project.org/6371 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Use QBasicAtomicInt load() instead of implicit castingBradley T. Hughes2011-10-101-1/+1
| | | | | | | | | The implicit casts will be unavailable in the near future. Change-Id: Ifcaf24a94caf20f6f50adaeaef05783b007b57d3 Reviewed-on: http://codereview.qt-project.org/6353 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* tests: eliminated usage of qttest_p4.prfRohan McGovern2011-10-0732-52/+94
| | | | | | | | | | | qttest_p4.prf was added as a convenience for Qt's own autotests in Qt4. It enables various crufty undocumented magic, of dubious value. Stop using it, and explicitly enable the things from it which we want. Change-Id: I7e6c67674ec669ad1ba7286648c7b4a501f4201c Reviewed-on: http://codereview.qt-project.org/6185 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Remove Symbian-specific code from tests.Jason McDonald2011-09-303-260/+0
| | | | | | | | | | Symbian is not a supported platform for Qt5, so this code is no longer required. Change-Id: I273c8bffdeec2bb026936d93c00ef3c79b7a1ad9 Reviewed-on: http://codereview.qt-project.org/5775 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Merge branch 'refactor'Gunnar Sletta2011-09-1312-22/+21
|\ | | | | | | | | | | | | Conflicts: src/xmlpatterns/xmlpatterns.pro Change-Id: I8d435220281ec372f23c98ab3c15c9a208bacad8
| * Build fix with latest refactored Qt5Jani Uusi-Rantala2011-09-061-11/+10
| | | | | | | | | | | | | | | | | | | | load(qt_module_config) was missing from project file and including qtbase.pri seemed to be completely wrong. Change-Id: I6df54292c54988ff2a7168a83b5b79835810b6ed Reviewed-on: http://codereview.qt.nokia.com/4219 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
| * Fix build.Friedemann Kleint2011-08-311-1/+1
| | | | | | | | | | | | Change-Id: I2dd8794eab33214dffaf069919e3abaae79122b3 Reviewed-on: http://codereview.qt.nokia.com/3987 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
| * QtXmlPatterns: Widget library split.Friedemann Kleint2011-05-2411-12/+14
| |
* | Remove obsolete testlib files from .gitignoreJason McDonald2011-08-231-2/+0
| | | | | | | | | | | | | | Change-Id: I9da4fa21331b0ab1e924601701013a85d1f90952 Reviewed-on: http://codereview.qt.nokia.com/3384 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* | Fixed compile of tests using libQtXmlPatternsSDKRohan McGovern2011-08-121-2/+2
| | | | | | | | | | | | | | | | | | Using $$QT_BUILD_TREE is not allowed. Use the correct values. Change-Id: I061c2d02d2d3a1cca114e464aa2a665f1dfa7e01 Reviewed-on: http://codereview.qt.nokia.com/2898 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
* | Fixed compile.Rohan McGovern2011-08-121-1/+1
| | | | | | | | | | | | | | | | | | QtXml/QXmlStreamReader -> QtCore/QXmlStreamReader Change-Id: I81a03637e75f92d4b2946e65f0967c349bdb99ea Reviewed-on: http://codereview.qt.nokia.com/2897 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
* | Respect $$QT.xmlpatterns.binsRohan McGovern2011-08-102-2/+2
| | | | | | | | | | | | | | | | | | | | A module's tools should build directly into $$QT.<module>.bins, just like its libraries and plugins. Change-Id: I5a630ed3e64dd6aee2a8d3bc9f2ff3246c203bc6 Reviewed-on: http://codereview.qt.nokia.com/2800 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
* | Update sync.profile dependencies to new syntaxAlan Alpert2011-07-081-8/+5
| | | | | | | | | | | | | | | | | | | | %dependencies now has a simpler format of gitmodule => gitref instead of using qt modules and keywords. Change-Id: I785f30e24e0a793218e2e307bdde56067760c517 Reviewed-on: http://codereview.qt.nokia.com/1274 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* | Fixed compile of qtxmlpatterns against latest qtbase (`qs' macro)Rohan McGovern2011-07-081-5/+3
| | | | | | | | | | | | | | | | | | | | ee85e9cc10bc6874c892b09fa54b5dbd79854069 adds a macro qs(str), which breaks some code already using `qs' as a variable name. Change-Id: I92ee0f77499a5c815a940f719febee9d01b843cb Reviewed-on: http://codereview.qt.nokia.com/1331 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtxmlpatterns-stagingQt Continuous Integration System2011-07-011-1/+1
|\ \ | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtxmlpatterns-staging: Reflect the move of the undo example.
| * | Reflect the move of the undo example.Casper van Donderen2011-07-011-1/+1
| | |
* | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtxmlpatterns-stagingQt Continuous Integration System2011-06-095-5/+5
|\ \ \ | |/ / | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtxmlpatterns-staging: Fix usage of QT_SOURCE_TREE Use feature profile loading instead of direct inclusion.
| * | Fix usage of QT_SOURCE_TREEMarius Storm-Olsen2011-06-074-4/+4
| | | | | | | | | | | | Functionality has been moved into qt_example.prf
| * | Use feature profile loading instead of direct inclusion.axis2011-06-071-1/+1
| | |
* | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtxmlpatterns-stagingQt Continuous Integration System2011-05-271-1/+1
|\ \ \ | |/ / | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtxmlpatterns-staging: Fixed failure of tst_qxmlquery::evaluateToReceiver
| * | Fixed failure of tst_qxmlquery::evaluateToReceiverRohan McGovern2011-05-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 8f95a19d330480bd86650c3d2e4e147d3bca5789 fixed the "missing Z" of QDateTime::toString for Qt::ISODate (see QTBUG-9698). The testdata for this test should have been updated at the same time, but it was forgotten. Reviewed-by: Jason McDonald Change-Id: I9b03519805533665afac15e0c970ac1c9e5d9ab4 (cherry picked from commit 237c620f6355fc81e85e65b9fd61249b0f77df5a)
* | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtxmlpatterns-stagingQt Continuous Integration System2011-05-24866-14762/+14762
|\ \ \ | |/ / | | / | |/ |/| * 'master' of git://scm.dev.nokia.troll.no/qt/qtxmlpatterns-staging: Update licenseheader text in source files for qtxmlpatterns Qt module
| * Update licenseheader text in source files for qtxmlpatterns Qt moduleJyri Tahtela2011-05-24866-14762/+14762
| | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtxmlpatterns-stagingQt Continuous Integration System2011-05-2319-7/+312
|\ \ | |/ | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtxmlpatterns-staging: Squashed commit of changes from the 4.8-temp branch. Squashed commit of the changes from the mobile-examples repository (4.7-generated-declarative branch). (cherry picked from commit 539311f7b2687e3148ea695ce06fee768abe7b44)
| * Squashed commit of changes from the 4.8-temp branch.David Boddie2011-05-207-0/+272
| |
| * Squashed commit of the changes from the mobile-examples repositoryDavid Boddie2011-05-2012-7/+40
| | | | | | | | | | (4.7-generated-declarative branch). (cherry picked from commit 539311f7b2687e3148ea695ce06fee768abe7b44)
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtxmlpatterns-stagingQt Continuous Integration System2011-05-187-35/+58
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtxmlpatterns-staging: Reduce usage of Q_ASSERT in autotests. Remove Q_ASSERT's from qabstractxmlnodemodel test Remove Q_ASSERT from qxmlquery autotest Remove Q_ASSERT's from qxmlquery autotest Remove Q_ASSERT from qxmlquery autotest Remove Q_ASSERT from qabstractxmlnodemodel test Remove Q_ASSERT from qabstractxmlnodemodel test Remove Q_ASSERT from qabstractxmlnodemodel test Remove Q_ASSERT from qabstractxmlnodemodel test Remove Q_ASSERT from qabstractxmlnodemodel test Remove Q_ASSERT from qabstractxmlnodemodel test Fix compiler warnings in qabstractxmlnodemodel test Remove Q_ASSERT's from xmlpatterns autotest
| * Reduce usage of Q_ASSERT in autotests.Jason McDonald2011-05-181-1/+1
| | | | | | | | | | | | | | | | | | | | Using Q_ASSERT does nothing in release-mode builds, and in debug builds it causes tests to terminate prematurely. It is much better to use QVERIFY or QCOMPARE. Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern (cherry picked from commit 3475168550c1a804f04f2a4edfeb30c04cd36551)
| * Remove Q_ASSERT's from qabstractxmlnodemodel testJason McDonald2011-05-181-8/+7
| | | | | | | | | | | | | | | | | | Report fatal errors rather than ignoring the errors in non-debug builds. Change-Id: I5d2f20113cbca11e272cf8fc2591e38b94d6853b Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern (cherry picked from commit 6f5751c45868a6dde51647462a331d49f848f2f0)
| * Remove Q_ASSERT from qxmlquery autotestJason McDonald2011-05-181-3/+2
| | | | | | | | | | | | | | | | | | Report fatal error in all builds not just debug builds. Change-Id: I6c64435d0382a160ac3602e5243fad9d9585f057 Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern (cherry picked from commit cb84f3d1a1499485d4c5314b6e94745c6def6888)
| * Remove Q_ASSERT's from qxmlquery autotestJason McDonald2011-05-182-4/+11
| | | | | | | | | | | | | | | | | | | | Make url validity check part of the regular test logic rather than aborting in debug builds and ignoring the error in release builds. Change-Id: Ic00610c04ee596f519b9d461748b401719cf41c0 Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern (cherry picked from commit 1acca025082bad566e5fe7078aa41f73316cd40b)
| * Remove Q_ASSERT from qxmlquery autotestJason McDonald2011-05-182-1/+8
| | | | | | | | | | | | | | | | | | | | Make stream validity check part of the regular test logic rather than aborting in debug builds and ignoring the error in release builds. Change-Id: I07dcba079eecd88bf16672c6019a8d6f5a829fee Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern (cherry picked from commit b841d30f25a87f8aafc4624fe09a3503ddc6ccda)
| * Remove Q_ASSERT from qabstractxmlnodemodel testJason McDonald2011-05-181-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | If new "axis" enum values are added in the future, the test should report a meaningful warning in the test output rather than aborting with a meaningless message in debug builds and failing silently in release builds. Change-Id: Ifdc7a9492c3ee196d7f0e6958eec34693efd244f Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern (cherry picked from commit f859ab10715a3cb69aa3f03574a046c886d34b44)
| * Remove Q_ASSERT from qabstractxmlnodemodel testJason McDonald2011-05-181-2/+5
| | | | | | | | | | | | | | | | | | | | | | Instead of aborting in debug builds and failing silently in release builds, print a meaningful warning message into the test output and return a null QVariant. Change-Id: Idcd70f5cb01528b522d84e391f6f8692a189f420 Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern (cherry picked from commit a0496d1db09dfaa6a2b31a5c23e154de7b4a2eb7)
View Lorry Controller Status