profile/ivi/qtxmlpatterns.git
12 years agoRemove the use of QT_MODULE()
Gunnar Sletta [Mon, 9 Jan 2012 08:05:11 +0000 (09:05 +0100)]
Remove the use of QT_MODULE()

Change-Id: Ia7b8143861c9e57c8f947b4c746958f0b0140410
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoAdding configuration files for documentation build
Michalina Ziemba [Tue, 10 Jan 2012 13:41:32 +0000 (14:41 +0100)]
Adding configuration files for documentation build

-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>
12 years agoUpdate copyright year in license headers.
Jason McDonald [Tue, 10 Jan 2012 04:12:14 +0000 (14:12 +1000)]
Update copyright year in license headers.

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>
12 years agoUpdate copyright year in license headers.
Jason McDonald [Thu, 5 Jan 2012 07:13:00 +0000 (17:13 +1000)]
Update copyright year in license headers.

Change-Id: Iba74aff1aba680f7b56314f3acae3478be9d3e56
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoQtXmlPatterns-test: Use QFINDTESTDATA to locate test data.
Friedemann Kleint [Wed, 21 Dec 2011 15:54:05 +0000 (16:54 +0100)]
QtXmlPatterns-test: Use QFINDTESTDATA to locate test data.

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>
12 years agoQtXmlPatterns: Fix warnings about unused variables.
Friedemann Kleint [Thu, 1 Dec 2011 10:14:10 +0000 (11:14 +0100)]
QtXmlPatterns: Fix warnings about unused variables.

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>
12 years agoFix compile warnings about assigned/unused variables.
Friedemann Kleint [Thu, 27 Oct 2011 15:16:23 +0000 (17:16 +0200)]
Fix compile warnings about assigned/unused variables.

Change-Id: I75cbbea2777f2359fa4d86fd28057dd16bc02feb
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoFix sanity check of network test server
Jason McDonald [Mon, 28 Nov 2011 06:43:55 +0000 (16:43 +1000)]
Fix sanity check of network test server

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>
12 years agoRemove needless include from xmlpatternsvalidator test.
Jason McDonald [Mon, 28 Nov 2011 06:30:18 +0000 (16:30 +1000)]
Remove needless include from xmlpatternsvalidator test.

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>
12 years agoMake private headers usable, and use them in the tests.
Rohan McGovern [Thu, 3 Nov 2011 00:57:57 +0000 (10:57 +1000)]
Make private headers usable, and use them in the tests.

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>
12 years agoTemporary skip xmlquery test on Mac
Honglei Zhang [Fri, 4 Nov 2011 08:11:23 +0000 (10:11 +0200)]
Temporary skip xmlquery test on Mac

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>
13 years agoFix test compilation on Windows.
Friedemann Kleint [Fri, 21 Oct 2011 11:39:47 +0000 (13:39 +0200)]
Fix test compilation on Windows.

Change-Id: Iad81e6c7908ba1f931c8634cb1c16649999a864c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
13 years agoRemove SkipMode parameter from QSKIP.
Jason McDonald [Wed, 19 Oct 2011 03:57:18 +0000 (13:57 +1000)]
Remove SkipMode parameter from QSKIP.

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>
13 years agotests: explicitly put the path to xmlpatterns tools
Rohan McGovern [Wed, 10 Aug 2011 03:28:53 +0000 (13:28 +1000)]
tests: explicitly put the path to xmlpatterns tools

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>
13 years agoRemove dead code from autotests.
Jason McDonald [Wed, 12 Oct 2011 06:21:52 +0000 (16:21 +1000)]
Remove dead code from autotests.

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>
13 years agoFix compilation of patternistexamples autotest.
Jason McDonald [Tue, 11 Oct 2011 02:01:01 +0000 (12:01 +1000)]
Fix compilation of patternistexamples autotest.

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>
13 years agoUse QBasicAtomicInt load() instead of implicit casting
Bradley T. Hughes [Mon, 10 Oct 2011 14:36:04 +0000 (16:36 +0200)]
Use QBasicAtomicInt load() instead of implicit casting

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>
13 years agotests: eliminated usage of qttest_p4.prf
Rohan McGovern [Thu, 6 Oct 2011 23:19:23 +0000 (09:19 +1000)]
tests: eliminated usage of qttest_p4.prf

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>
13 years agoRemove Symbian-specific code from tests.
Jason McDonald [Thu, 29 Sep 2011 06:01:54 +0000 (16:01 +1000)]
Remove Symbian-specific code from tests.

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>
13 years agoMerge branch 'refactor'
Gunnar Sletta [Tue, 13 Sep 2011 07:33:49 +0000 (09:33 +0200)]
Merge branch 'refactor'

Conflicts:
src/xmlpatterns/xmlpatterns.pro

Change-Id: I8d435220281ec372f23c98ab3c15c9a208bacad8

13 years agoBuild fix with latest refactored Qt5
Jani Uusi-Rantala [Mon, 5 Sep 2011 18:09:59 +0000 (21:09 +0300)]
Build fix with latest refactored Qt5

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>
13 years agoFix build.
Friedemann Kleint [Wed, 31 Aug 2011 14:18:11 +0000 (16:18 +0200)]
Fix build.

Change-Id: I2dd8794eab33214dffaf069919e3abaae79122b3
Reviewed-on: http://codereview.qt.nokia.com/3987
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
13 years agoRemove obsolete testlib files from .gitignore
Jason McDonald [Tue, 23 Aug 2011 05:56:36 +0000 (15:56 +1000)]
Remove obsolete testlib files from .gitignore

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>
13 years agoFixed compile of tests using libQtXmlPatternsSDK
Rohan McGovern [Fri, 12 Aug 2011 05:32:11 +0000 (15:32 +1000)]
Fixed compile of tests using libQtXmlPatternsSDK

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>
13 years agoFixed compile.
Rohan McGovern [Fri, 12 Aug 2011 05:20:38 +0000 (15:20 +1000)]
Fixed compile.

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>
13 years agoRespect $$QT.xmlpatterns.bins
Rohan McGovern [Wed, 10 Aug 2011 04:07:07 +0000 (14:07 +1000)]
Respect $$QT.xmlpatterns.bins

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>
13 years agoUpdate sync.profile dependencies to new syntax
Alan Alpert [Thu, 7 Jul 2011 07:35:17 +0000 (17:35 +1000)]
Update sync.profile dependencies to new syntax

%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>
13 years agoFixed compile of qtxmlpatterns against latest qtbase (`qs' macro)
Rohan McGovern [Thu, 7 Jul 2011 23:16:39 +0000 (09:16 +1000)]
Fixed compile of qtxmlpatterns against latest qtbase (`qs' macro)

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>
13 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtxmlpatterns-staging
Qt Continuous Integration System [Fri, 1 Jul 2011 13:02:44 +0000 (23:02 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtxmlpatterns-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtxmlpatterns-staging:
  Reflect the move of the undo example.

13 years agoReflect the move of the undo example.
Casper van Donderen [Fri, 1 Jul 2011 12:58:25 +0000 (14:58 +0200)]
Reflect the move of the undo example.

13 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtxmlpatterns-staging
Qt Continuous Integration System [Thu, 9 Jun 2011 07:11:12 +0000 (17:11 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtxmlpatterns-staging

* '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.

13 years agoFix usage of QT_SOURCE_TREE
Marius Storm-Olsen [Tue, 7 Jun 2011 18:52:14 +0000 (13:52 -0500)]
Fix usage of QT_SOURCE_TREE

Functionality has been moved into qt_example.prf

13 years agoUse feature profile loading instead of direct inclusion.
axis [Mon, 30 May 2011 14:11:05 +0000 (16:11 +0200)]
Use feature profile loading instead of direct inclusion.

13 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtxmlpatterns-staging
Qt Continuous Integration System [Fri, 27 May 2011 00:30:45 +0000 (10:30 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtxmlpatterns-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtxmlpatterns-staging:
  Fixed failure of tst_qxmlquery::evaluateToReceiver

13 years agoFixed failure of tst_qxmlquery::evaluateToReceiver
Rohan McGovern [Thu, 26 May 2011 07:01:33 +0000 (17:01 +1000)]
Fixed failure of tst_qxmlquery::evaluateToReceiver

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)

13 years agoQtXmlPatterns: Widget library split.
Friedemann Kleint [Tue, 24 May 2011 14:32:27 +0000 (16:32 +0200)]
QtXmlPatterns: Widget library split.

13 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtxmlpatterns-staging
Qt Continuous Integration System [Tue, 24 May 2011 13:18:03 +0000 (23:18 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtxmlpatterns-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtxmlpatterns-staging:
  Update licenseheader text in source files for qtxmlpatterns Qt module

13 years agoUpdate licenseheader text in source files for qtxmlpatterns Qt module
Jyri Tahtela [Tue, 24 May 2011 13:14:28 +0000 (16:14 +0300)]
Update licenseheader text in source files for qtxmlpatterns Qt module

Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.

Reviewed-by: Trust Me
13 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtxmlpatterns-staging
Qt Continuous Integration System [Mon, 23 May 2011 12:59:20 +0000 (22:59 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtxmlpatterns-staging

* '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)

13 years agoSquashed commit of changes from the 4.8-temp branch.
David Boddie [Wed, 11 May 2011 15:35:46 +0000 (17:35 +0200)]
Squashed commit of changes from the 4.8-temp branch.

13 years agoSquashed commit of the changes from the mobile-examples repository
David Boddie [Wed, 27 Apr 2011 17:16:41 +0000 (19:16 +0200)]
Squashed commit of the changes from the mobile-examples repository
(4.7-generated-declarative branch).
(cherry picked from commit 539311f7b2687e3148ea695ce06fee768abe7b44)

13 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtxmlpatterns-staging
Qt Continuous Integration System [Wed, 18 May 2011 01:08:48 +0000 (11:08 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtxmlpatterns-staging

* '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

13 years agoReduce usage of Q_ASSERT in autotests.
Jason McDonald [Wed, 18 May 2011 00:45:40 +0000 (10:45 +1000)]
Reduce usage of Q_ASSERT in autotests.

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)

13 years agoRemove Q_ASSERT's from qabstractxmlnodemodel test
Jason McDonald [Tue, 10 May 2011 03:30:56 +0000 (13:30 +1000)]
Remove Q_ASSERT's from qabstractxmlnodemodel test

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)

13 years agoRemove Q_ASSERT from qxmlquery autotest
Jason McDonald [Mon, 9 May 2011 07:40:30 +0000 (17:40 +1000)]
Remove Q_ASSERT from qxmlquery autotest

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)

13 years agoRemove Q_ASSERT's from qxmlquery autotest
Jason McDonald [Mon, 9 May 2011 07:45:52 +0000 (17:45 +1000)]
Remove Q_ASSERT's from qxmlquery autotest

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)

13 years agoRemove Q_ASSERT from qxmlquery autotest
Jason McDonald [Mon, 9 May 2011 08:21:18 +0000 (18:21 +1000)]
Remove Q_ASSERT from qxmlquery autotest

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)

13 years agoRemove Q_ASSERT from qabstractxmlnodemodel test
Jason McDonald [Fri, 6 May 2011 04:16:48 +0000 (14:16 +1000)]
Remove Q_ASSERT from qabstractxmlnodemodel test

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)

13 years agoRemove Q_ASSERT from qabstractxmlnodemodel test
Jason McDonald [Fri, 6 May 2011 04:08:10 +0000 (14:08 +1000)]
Remove Q_ASSERT from qabstractxmlnodemodel test

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)

13 years agoRemove Q_ASSERT from qabstractxmlnodemodel test
Jason McDonald [Fri, 6 May 2011 04:00:00 +0000 (14:00 +1000)]
Remove Q_ASSERT from qabstractxmlnodemodel test

Rather than aborting in a debug build and failing silently in a release
build, report a warning and return a null model index if the first
(root) node of the model is not a document.  The null return value will
cause initTestCase() to fail gracefully.

Change-Id: I15e9456929bbb3f0bd50d30333c49143b6f0aad7
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit a80ecc34565d6efc474bca2322046f4200ad51db)

13 years agoRemove Q_ASSERT from qabstractxmlnodemodel test
Jason McDonald [Fri, 6 May 2011 03:51:20 +0000 (13:51 +1000)]
Remove Q_ASSERT from qabstractxmlnodemodel test

Instead of aborting in a debug build and failing silently in a release
build when the internal state of the model is incorrect, report a
meaningful fatal error in all builds.

Change-Id: I64ca4dde070cb7fbe69684a36092d53e5b84d80a
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 68027b186fe547a5579d07480e097bfb69c79de9)

13 years agoRemove Q_ASSERT from qabstractxmlnodemodel test
Jason McDonald [Fri, 6 May 2011 03:35:14 +0000 (13:35 +1000)]
Remove Q_ASSERT from qabstractxmlnodemodel test

Constructing a model index from a null pointer will cause the test to
crash later.  Instead of crashing this way in a release build and
aborting in a debug build, report the fatal error in all builds.

Change-Id: I43ce4c8fa48caa05aaf09ac3c1453d35a2de65bf
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 57fd8c5ac803398238982c4b74bc5ce048671201)

13 years agoRemove Q_ASSERT from qabstractxmlnodemodel test
Jason McDonald [Thu, 5 May 2011 07:36:59 +0000 (17:36 +1000)]
Remove Q_ASSERT from qabstractxmlnodemodel test

When no content can be loaded to create the model, return a null model
(which will make the test fail gracefully) rather than aborting in a
debug build and failing silently in a release build.

Change-Id: I28f0bb92c617c8dafd1089d0b3dafcfef0c0da53
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 416d45caa9feefe8337795adc4b93a8148d57a3a)

13 years agoFix compiler warnings in qabstractxmlnodemodel test
Jason McDonald [Thu, 5 May 2011 08:42:32 +0000 (18:42 +1000)]
Fix compiler warnings in qabstractxmlnodemodel test

The first parameter to qWarning() should be a format string to avoid
problems caused by the data string containing format specifiers.

Change-Id: Ib40c0dcd766203fc41182a50680733fff9035045
Reviewed-by: Rohan McGovern
(cherry picked from commit 4e7194ba2fd29dc38adc5580cb85b6eed238ff64)

13 years agoRemove Q_ASSERT's from xmlpatterns autotest
Jason McDonald [Wed, 4 May 2011 01:17:49 +0000 (11:17 +1000)]
Remove Q_ASSERT's from xmlpatterns autotest

Verify initial state in initTestCase() rather than asserting in the
test class's constructor.

Change-Id: Ic7612a5368e35b2abda96828d2a95690baeaf6a9
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit edd9d3f64f1532e39a80a2c7a97a2501391b2316)

13 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtxmlpatterns-staging
Qt Continuous Integration System [Fri, 13 May 2011 13:01:12 +0000 (23:01 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtxmlpatterns-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtxmlpatterns-staging:
  Update module version number to 5.0.0

13 years agoUpdate module version number to 5.0.0
Eckhart Koppen [Fri, 13 May 2011 10:36:03 +0000 (13:36 +0300)]
Update module version number to 5.0.0

Updated .pri file variables

13 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtxmlpatterns-staging
Qt Continuous Integration System [Thu, 12 May 2011 02:03:06 +0000 (12:03 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtxmlpatterns-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtxmlpatterns-staging:
  tests: build autotests by default for qtxmlpatterns
  tests: fix private header inclusion problems in qtxmlpatterns tests
  tests: remove contains(QT_CONFIG,xmlpatterns) conditional
  tests: mark xmlpatternsschemats as a private-test

13 years agotests: build autotests by default for qtxmlpatterns
Rohan McGovern [Wed, 11 May 2011 22:53:27 +0000 (08:53 +1000)]
tests: build autotests by default for qtxmlpatterns

Configure Qt with `-nomake tests' if you don't want the tests.

Reviewed-by: Jason McDonald
Change-Id: I73c408278763578173ce0a9b2d57ea4dfcefa49d

13 years agotests: fix private header inclusion problems in qtxmlpatterns tests
Rohan McGovern [Wed, 11 May 2011 23:27:08 +0000 (09:27 +1000)]
tests: fix private header inclusion problems in qtxmlpatterns tests

Most xmlpatterns tests use private QtCore and QtXmlPatterns headers,
so `QT += core-private xmlpatterns-private' is required.

In Qt5, $$QT_SOURCE_TREE refers to the source tree of `qtbase'.
Change it to `$$QT.xmlpatterns.sources'.

Reviewed-by: Jason McDonald
Change-Id: I711585819d2ce5a8b151e76ed79fa13be1f29379

13 years agotests: remove contains(QT_CONFIG,xmlpatterns) conditional
Rohan McGovern [Wed, 11 May 2011 23:25:35 +0000 (09:25 +1000)]
tests: remove contains(QT_CONFIG,xmlpatterns) conditional

Tests which live within xmlpatterns should not test if xmlpatterns is
enabled.  It's confusing and unnecessary.

Reviewed-by: Jason McDonald
Change-Id: Icd459841f7480118502cf5d2cb57cca2d4e600fe

13 years agotests: mark xmlpatternsschemats as a private-test
Rohan McGovern [Wed, 11 May 2011 23:22:07 +0000 (09:22 +1000)]
tests: mark xmlpatternsschemats as a private-test

This test depends on xmlpatternssdk, which uses private symbols.

Reviewed-by: Jason McDonald
Change-Id: If1a24512b0dd2fd4a966605c6adef3be83be19b6

13 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtxmlpatterns-staging
Qt Continuous Integration System [Wed, 11 May 2011 11:00:31 +0000 (21:00 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtxmlpatterns-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtxmlpatterns-staging:
  Add QTXMLPATTERNS_VERSION macro for qtxmlpatterns

13 years agoAdd QTXMLPATTERNS_VERSION macro for qtxmlpatterns
Liang Qi [Wed, 11 May 2011 10:48:16 +0000 (12:48 +0200)]
Add QTXMLPATTERNS_VERSION macro for qtxmlpatterns

Provide version info for each library.

Task-number: QTMODULARIZATION-44
Reviewed-by: axis
13 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtxmlpatterns-staging
Qt Continuous Integration System [Thu, 5 May 2011 04:33:58 +0000 (14:33 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtxmlpatterns-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtxmlpatterns-staging:
  Added .tag file with Git revision.
  Use private headers
  Add module.prf, and install MODULE_PRI for each module

13 years agoAdded .tag file with Git revision.
axis [Tue, 3 May 2011 14:21:08 +0000 (16:21 +0200)]
Added .tag file with Git revision.

13 years agoUse private headers
Marius Storm-Olsen [Thu, 21 Apr 2011 12:55:58 +0000 (07:55 -0500)]
Use private headers

13 years agoAdd module.prf, and install MODULE_PRI for each module
Marius Storm-Olsen [Fri, 1 Apr 2011 10:47:28 +0000 (05:47 -0500)]
Add module.prf, and install MODULE_PRI for each module

Output warning if not present

13 years agoAdded dependency information to the sync.profile.
axis [Wed, 27 Apr 2011 10:34:35 +0000 (12:34 +0200)]
Added dependency information to the sync.profile.

13 years agoAdd .gitignore to each module
axis [Wed, 27 Apr 2011 10:06:07 +0000 (12:06 +0200)]
Add .gitignore to each module

13 years agoAdd tst_headersclean for each module
Liang Qi [Fri, 25 Mar 2011 09:32:15 +0000 (10:32 +0100)]
Add tst_headersclean for each module

13 years agoModularized tst_compilerwarnings
Liang Qi [Wed, 23 Mar 2011 16:25:22 +0000 (17:25 +0100)]
Modularized tst_compilerwarnings

13 years agoModularized tst_bic and add some helper functions for global test
Liang Qi [Tue, 22 Mar 2011 15:13:21 +0000 (16:13 +0100)]
Modularized tst_bic and add some helper functions for global test

13 years agoIntroduced the QT.<module>.plugins variable to module profiles.
axis [Tue, 22 Mar 2011 12:20:53 +0000 (13:20 +0100)]
Introduced the QT.<module>.plugins variable to module profiles.

13 years agoAdded QT.<module>.imports support to module profiles.
axis [Thu, 17 Mar 2011 09:57:48 +0000 (10:57 +0100)]
Added QT.<module>.imports support to module profiles.

13 years agoMake auto test build
Liang Qi [Fri, 7 Jan 2011 12:47:49 +0000 (13:47 +0100)]
Make auto test build

13 years agoMake each module refer to its own bin/
Marius Storm-Olsen [Thu, 6 Jan 2011 18:52:17 +0000 (12:52 -0600)]
Make each module refer to its own bin/

Since modules cannot rely on QtCore having a build directory, nor
can they build the applications directly into $$[QT_INSTALL_BINS]
each module needs their own bin/. Add this path to each module's
pri file, so others can use their applications

13 years agoExtended module profiles.
axis [Mon, 3 Jan 2011 18:01:57 +0000 (19:01 +0100)]
Extended module profiles.

Each module now sets the QT_CONFIG variable itself.

13 years agoAdd the private_includes path to the modules .pri file
Liang Qi [Thu, 23 Dec 2010 08:38:00 +0000 (09:38 +0100)]
Add the private_includes path to the modules .pri file

13 years agoAdd the source path to the modules .pri file
Marius Storm-Olsen [Fri, 17 Dec 2010 05:34:20 +0000 (23:34 -0600)]
Add the source path to the modules .pri file

13 years agoRemove the hardcode QT_CONFIG in those pri files.
Liang Qi [Thu, 25 Nov 2010 12:39:10 +0000 (13:39 +0100)]
Remove the hardcode QT_CONFIG in those pri files.

13 years agoMake modules compile without hardcoded paths
Marius Storm-Olsen [Wed, 24 Nov 2010 19:21:56 +0000 (13:21 -0600)]
Make modules compile without hardcoded paths

13 years agoAdd module specific pris, and make syncqt create fwd includes
Marius Storm-Olsen [Thu, 25 Nov 2010 02:21:06 +0000 (20:21 -0600)]
Add module specific pris, and make syncqt create fwd includes

The module specific pris define the modules
    name
    version
    dependencies
    include paths
    lib paths
    additional CONFIGs and DEFINES
They are located in the modules source directory, with fwd
includes created in QtBase/mkspecs/modules build directory.
The pris use
    QT_MODULE_INCLUDE_BASE
    QT_MODULE_LIB_BASE
to specify the locations for includes and libs. These paths
are normally based on
    QT_INSTALL_HEADERS
    QT_INSTALL_LIBS
for installed modules, but overridden to the module's build
directory by syncqt for the fwd included pris.
The path of the pris must be specified in the sync.profile
for syncqt to create the fwding pris in QtBase.

13 years agoFirst attempt to build xmlpatterns.
Liang Qi [Tue, 16 Nov 2010 13:34:35 +0000 (14:34 +0100)]
First attempt to build xmlpatterns.

13 years agoStart work on XmlPatterns
Marius Storm-Olsen [Fri, 12 Nov 2010 19:31:46 +0000 (13:31 -0600)]
Start work on XmlPatterns

13 years agoMoved to using a feature profile instead of direct inclusion.
axis [Wed, 27 Apr 2011 10:05:43 +0000 (12:05 +0200)]
Moved to using a feature profile instead of direct inclusion.

13 years agoInitial import from the monolithic Qt.
Qt by Nokia [Wed, 27 Apr 2011 10:05:43 +0000 (12:05 +0200)]
Initial import from the monolithic Qt.

This is the beginning of revision history for this module. If you
want to look at revision history older than this, please refer to the
Qt Git wiki for how to use Git history grafting. At the time of
writing, this wiki is located here:

http://qt.gitorious.org/qt/pages/GitIntroductionWithQt

If you have already performed the grafting and you don't see any
history beyond this commit, try running "git log" with the "--follow"
argument.

Branched from the monolithic repo, Qt master branch, at commit
896db169ea224deb96c59ce8af800d019de63f12