profile/ivi/qtxmlpatterns.git
11 years agoremove obsolete DEPENDPATH assignments upstream
Oswald Buddenhagen [Fri, 14 Dec 2012 19:15:10 +0000 (20:15 +0100)]
remove obsolete DEPENDPATH assignments

qmake now adds CONFIG+=depend_includepath by default, making manual
DEPENDPATH setup unnecessary.

Change-Id: Ibe763804b4cd451f19bfdac660436772644bf285
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agomake qtbase source dependency explicit
Oswald Buddenhagen [Mon, 3 Dec 2012 20:52:06 +0000 (21:52 +0100)]
make qtbase source dependency explicit

Change-Id: I7682d9b75a41f6084834a08db3f37925d5153afe
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agomake use of qt_headersclean.prf
Oswald Buddenhagen [Thu, 6 Dec 2012 16:27:23 +0000 (17:27 +0100)]
make use of qt_headersclean.prf

Change-Id: If4dc7b40b9222113cb11d31409a39272004c38d1
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agoremove trafficinfo example and related doc
Jing Bai [Fri, 7 Dec 2012 16:35:25 +0000 (17:35 +0100)]
remove trafficinfo example and related doc

Due to trafikanten API change, this example doesn't work anymore.
The new API uses JSON based content, we can probably use it for qjson
example.

Task-number: QTBUG-28423
Change-Id: I36b499b4b2f36d46314937c24d9a2df3bba7b391
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoQtXmlPatterns: Doc: Fix links to designer manual
David Schulz [Fri, 7 Dec 2012 11:38:54 +0000 (12:38 +0100)]
QtXmlPatterns: Doc: Fix links to designer manual

Change-Id: Ifbcf2769c8212eb289759d64b9637106792a948d
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
11 years agocentralize and fixup example sources install targets
Joerg Bornemann [Tue, 4 Dec 2012 14:27:01 +0000 (15:27 +0100)]
centralize and fixup example sources install targets

This follows suit with aeb036e in qtbase.

Change-Id: I3b93a30194cddd7514f05ce915eecb2e1ed6433c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
11 years agosync.profile: Point dependencies to 'refs/heads/stable'
Sergio Ahumada [Tue, 4 Dec 2012 10:36:58 +0000 (11:36 +0100)]
sync.profile: Point dependencies to 'refs/heads/stable'

We should test stable branches against stable branches only.
At some point we should automate the merges from dev->stable->release
and decide how to handle possible merge conflicts.

This is good enough for the time being.

Change-Id: Ie117ec0e488c740c0be01359912520d54c24248f
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
11 years agofixing linking against non-installed libs
Oswald Buddenhagen [Fri, 16 Nov 2012 17:16:45 +0000 (18:16 +0100)]
fixing linking against non-installed libs

Task-number: QTBUG-27427
Change-Id: I947d67b242e5a882f08a0672eaad076f818bf29d
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agoDoc: Edited qdocconf file to produce correct QCH titles.
Jerome Pasion [Mon, 3 Dec 2012 15:01:44 +0000 (16:01 +0100)]
Doc: Edited qdocconf file to produce correct QCH titles.

Task-number: QTBUG-28341
Change-Id: I35301f8e29ee8502d4cd77b2ebf0f043eb59ab91
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
11 years agoDoc: Grouped the XML pattern examples under xmlpattern_examples group
Venugopal Shivashankar [Fri, 30 Nov 2012 17:51:27 +0000 (18:51 +0100)]
Doc: Grouped the XML pattern examples under xmlpattern_examples group

Change-Id: Id026f8fe89d5a6e59de5bca14b5d0b5eb2a41752
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoChange copyright information from Nokia to Digia
Sergio Ahumada [Wed, 28 Nov 2012 21:39:02 +0000 (22:39 +0100)]
Change copyright information from Nokia to Digia

Change-Id: Ic2e32ec9bf39448b6dc51da856359a1cfc6e00c8
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoAlways get the default flags from QAIM.
Stephen Kelly [Mon, 26 Nov 2012 13:06:00 +0000 (14:06 +0100)]
Always get the default flags from QAIM.

Change-Id: I89abe8fdbd836804624a669296ae673230149472
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
11 years agoDisplay first result as well
Christian Stenger [Thu, 22 Nov 2012 14:34:08 +0000 (15:34 +0100)]
Display first result as well

Change-Id: If014d72cee6e3dd9e822a36390f56754c30e3848
Reviewed-by: hjk <qthjk@ovi.com>
11 years agoDoc: Modularized Qt XML Patterns documentation.
Jerome Pasion [Thu, 22 Nov 2012 15:35:24 +0000 (16:35 +0100)]
Doc: Modularized Qt XML Patterns documentation.

-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>
11 years agoStylefixes for examples in qtxmlpatterns
Christian Stenger [Thu, 22 Nov 2012 14:24:49 +0000 (15:24 +0100)]
Stylefixes for examples in qtxmlpatterns

Change-Id: I5a7a22779f13805479b37970888a26250c56a70d
Reviewed-by: hjk <qthjk@ovi.com>
11 years agoFix building of installed examples.
Friedemann Kleint [Wed, 21 Nov 2012 15:08:12 +0000 (16:08 +0100)]
Fix building of installed examples.

- Install xmlpatterns.pro and its shared folder
- Add missing resources.

Task-number: QTBUG-27977
Change-Id: Ib7db1d23595cd52bd32d68a9962a7d49dfe7f02d
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
11 years agoMerge branch 'newdocs'
Eskil Abrahamsen Blomfeldt [Tue, 20 Nov 2012 09:36:57 +0000 (10:36 +0100)]
Merge branch 'newdocs'

Change-Id: If338bfeddf4cbd1c2ea8d4335399db21f44fbf4c

11 years agoCMake: Remove obsolete test_modules test
Stephen Kelly [Wed, 31 Oct 2012 13:59:49 +0000 (14:59 +0100)]
CMake: Remove obsolete test_modules test

The generated module_includes test is a super-set of this test.

Change-Id: Ibd292df016adede59d0fb5d02c0ec387c8039a9b
Reviewed-by: Rohan McGovern [inactive] <rohan.mcgovern@nokia.com>
11 years agoCMake: Test module includes
Stephen Kelly [Mon, 29 Oct 2012 14:22:56 +0000 (15:22 +0100)]
CMake: Test module includes

Change-Id: I87c2686c2ac2c5f7fb93395175c780701551b9d7
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
11 years agoDoc: Removed the HTML template from the .qdocconf files
Jerome Pasion [Fri, 26 Oct 2012 13:21:24 +0000 (15:21 +0200)]
Doc: Removed the HTML template from the .qdocconf files

-qt-module-defaults.qdocconf already contains the HTML template.

Change-Id: I044a25f4fe6a42514b6595c2b26b799192f66e7b
Reviewed-by: Martin Smith <martin.smith@digia.com>
11 years agoTests: Use qInstallMessageHandler()
Kai Koehne [Thu, 13 Sep 2012 13:27:43 +0000 (15:27 +0200)]
Tests: Use qInstallMessageHandler()

qInstallMsgHandler got deprecated in Qt 5.

Change-Id: I4f2b7cad5f2b6a1d1c617e41a62ee0cbf11bcd47
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
11 years agoFix XmlListModel memory leak
Ari Koivisto [Wed, 3 Oct 2012 16:29:33 +0000 (19:29 +0300)]
Fix XmlListModel memory leak

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>
11 years agoUpdate docs after modularization of docs
Tor Arne Vestbø [Thu, 11 Oct 2012 11:37:54 +0000 (13:37 +0200)]
Update docs after modularization of docs

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>
11 years agoDon't have spaces in the project name. It's inconsistent.
Jan Arve Saether [Mon, 24 Sep 2012 13:01:16 +0000 (15:01 +0200)]
Don't have spaces in the project name. It's inconsistent.

This is just for consistency, otherwise we would have to tell it to
look for the qtxmlpatterns/qt-xml-patterns.index file.

Change-Id: Id374511e09bba038209fe48616313b16e0a6e4b3
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoBuild fix after QVariant change.
Jędrzej Nowacki [Wed, 10 Oct 2012 16:08:00 +0000 (18:08 +0200)]
Build fix after QVariant change.

QVariant(Qt::GlobalColor) was removed in Qt5.

Change-Id: I08b89fc6799e3645755dd435cc8b861fafd9fd05
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
11 years agoRemove invalid URIs from testing with QXmlQuery
Thiago Macieira [Wed, 3 Oct 2012 15:45:38 +0000 (08:45 -0700)]
Remove invalid URIs from testing with QXmlQuery

QXmlQuery requires proper URIs/URLs and these two aren't valid. A scheme
is never empty and a path cannot contain a colon before the first slash.

QUrl has been pointing out that new error condition since
7d62f8ace542e04e3ddf92eec4fdad8d34ac9585

Change-Id: Ic206908345f45b1cce0a3733584a65b02b8c2791
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
11 years agoHTML template: Updated copyright notice from Nokia to Digia Plc
Jerome Pasion [Tue, 25 Sep 2012 10:29:21 +0000 (12:29 +0200)]
HTML template: Updated copyright notice from Nokia to Digia Plc

Change-Id: I37e2b67f1f3a0d26c7b2d5a873a1c1acd0e71a55
Reviewed-by: Martin Smith <martin.smith@digia.com>
11 years agoChange copyrights from Nokia to Digia
Iikka Eklund [Mon, 24 Sep 2012 07:07:03 +0000 (10:07 +0300)]
Change copyrights from Nokia to Digia

Change copyrights and license headers from Nokia to Digia

Change-Id: I34508f293d75832657f79479e2a8c184e873e154
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoDoc: Adding documentation templates from qtbase
Jerome Pasion [Fri, 21 Sep 2012 12:41:19 +0000 (14:41 +0200)]
Doc: Adding documentation templates from qtbase

Task-number: QTBUG-27239
Change-Id: Ia3586742637201c683352dd35b38e96bac571e0c
Reviewed-by: Martin Smith <martin.smith@digia.com>
11 years agocentralize load(qt_build_config)s in .qmake.conf
Oswald Buddenhagen [Mon, 3 Sep 2012 10:16:04 +0000 (12:16 +0200)]
centralize load(qt_build_config)s in .qmake.conf

Change-Id: Ide097efe50d6d1d4b42ef6980c83f3e9ad7d2ba1
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
11 years agoUpdate the git-archive export options
Thiago Macieira [Wed, 29 Aug 2012 19:40:05 +0000 (21:40 +0200)]
Update the git-archive export options

The .gitattributes and .gitignore files do not need to be present in
packaged sources, as they are for people using the Git repository.
People who download tarballs usually don't reimport into Git -- they
should just download the actual repositories.

Meanwhile, the .tag file is quite useful. Instead of making Git extract
to the useless SHA-1 of the $n string, ask git-archive to store
the SHA-1 of the commit being packaged.

Change-Id: Ia431c37780086366c60eb2b4281382740f64da57
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
11 years agoUse QMAKE_DOCS
J-P Nurmi [Tue, 21 Aug 2012 15:15:50 +0000 (17:15 +0200)]
Use QMAKE_DOCS

Change-Id: I565956b9e2ae59a0f30ac1672570078beaa708ba
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
11 years agofollow rename of qt_module_config.prf to qt_module.prf
Oswald Buddenhagen [Tue, 7 Aug 2012 17:28:14 +0000 (19:28 +0200)]
follow rename of qt_module_config.prf to qt_module.prf

Change-Id: I68a1c748066da20557b43beab3cdb98d1b1bb53e
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
11 years agoSet the Qt API level to compatibility mode in all tests.
Thiago Macieira [Wed, 1 Aug 2012 11:48:22 +0000 (13:48 +0200)]
Set the Qt API level to compatibility mode in all tests.

Qt 5.0 beta requires changing the default to the 5.0 API, disabling
the deprecated code. However, tests should test (and often do) the
compatibility API too, so turn it back on.

Task-number: QTBUG-25053
Change-Id: Iab3d9fa844e74b7f8a17dbe1c26f9df6fa8dfadc
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
11 years agoAdd the CMake directory created during unit testing to .gitignore.
Stephen Kelly [Mon, 23 Jul 2012 07:52:22 +0000 (09:52 +0200)]
Add the CMake directory created during unit testing to .gitignore.

Change-Id: I58081e5dcea9e4a154de11ea897f0ba9f7399f3f
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
11 years agoTest that the package configs for QtXmlPatterns work.
Stephen Kelly [Thu, 19 Jul 2012 12:14:31 +0000 (14:14 +0200)]
Test that the package configs for QtXmlPatterns work.

Change-Id: I20afce7ea2f8c2d1ee0dcaaae9963e36b9cdf977
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
11 years agoQt XML Patterns File System Example: Do not bind to a null node index
Topi Reiniö [Wed, 4 Jul 2012 11:38:58 +0000 (13:38 +0200)]
Qt XML Patterns File System Example: Do not bind to a null node index

Adds a check for validity of the file node index before running an
XQuery.

In evaluateResult(), QXmlQuery binds to a QXmlNodeModelIndex variable
without checking if it's valid. This causes an assert to trigger if
the default directory that the example tries to open does not exist.
In this case, m_fileNode has the default (null) value when
evaluateResult() is invoked on QComboBox::currentIndexChanged()
signal.

Task-number: QTBUG-26081
Change-Id: I03c39939b57fcf658527ce3110fdc30d204de520
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
11 years agoQtXmlPatterns: Fix examples installs.
Friedemann Kleint [Tue, 10 Jul 2012 13:46:31 +0000 (15:46 +0200)]
QtXmlPatterns: Fix examples installs.

Change-Id: I441077a42b65415ea5bf54dc4845f21568e68f21
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
11 years agodon't reference $$QT_SOURCE/BUILD_TREE - they're unavailable here
Oswald Buddenhagen [Mon, 21 May 2012 10:16:44 +0000 (12:16 +0200)]
don't reference $$QT_SOURCE/BUILD_TREE - they're unavailable here

Change-Id: I31bed7091294dea96ab06f05aa90267757d23c82
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
11 years agouse centralized handling of QT_BUILD_PARTS
Oswald Buddenhagen [Tue, 3 Jul 2012 19:30:17 +0000 (21:30 +0200)]
use centralized handling of QT_BUILD_PARTS

Change-Id: Ie33c32028e48eb40815a3003db3cb805dba4a072
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
11 years agomake test suite properly shadow build compatible
Oswald Buddenhagen [Mon, 25 Jun 2012 19:42:55 +0000 (21:42 +0200)]
make test suite properly shadow build compatible

Change-Id: I42331f1894c6c09d098d84fc41f96c40f4725907
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
11 years agofix abuse of QUrl c'tor
Oswald Buddenhagen [Wed, 27 Jun 2012 18:43:22 +0000 (20:43 +0200)]
fix abuse of QUrl c'tor

the code didn't work particularly well with absolute windows paths ...

Change-Id: Idd30cf20c24d9a3dc1aa1a173a0018f364ef1233
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
11 years agoAdd qtxmlpatternsglobal.h containing the Q_XMLPATTERNS_EXPORT macro
Thiago Macieira [Thu, 7 Jun 2012 12:33:42 +0000 (14:33 +0200)]
Add qtxmlpatternsglobal.h containing the Q_XMLPATTERNS_EXPORT macro

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>
11 years agobuild system cleanups
Oswald Buddenhagen [Thu, 12 Apr 2012 10:45:48 +0000 (12:45 +0200)]
build system cleanups

- 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>
11 years agoauto-generate module pris
Oswald Buddenhagen [Thu, 12 Apr 2012 09:28:42 +0000 (11:28 +0200)]
auto-generate module pris

Change-Id: I358b29978987885eb46c8e1032a9d86b3014cb52
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
11 years agotests: No need to exclude files after the move out of Qt.
Holger Hans Peter Freyther [Sun, 29 Jan 2012 09:09:37 +0000 (10:09 +0100)]
tests: No need to exclude files after the move out of Qt.

The test made sense when being located in the monolithic Qt
repository but right now the test is not needed.

Change-Id: If4212c0a9d16cd210a6b031c95000491e5948515
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
11 years agoFix compilation of examples when Qt is configured with -no-widgets
Kent Hansen [Wed, 6 Jun 2012 19:52:31 +0000 (21:52 +0200)]
Fix compilation of examples when Qt is configured with -no-widgets

Change-Id: I4bd904946c7f27dd371138457ef894b4576abd61
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
11 years agochange naming convention for template source files
Oswald Buddenhagen [Wed, 20 Jun 2012 16:49:40 +0000 (18:49 +0200)]
change naming convention for template source files

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>
11 years agoChanged tests to work from install directory
Sergio Ahumada [Wed, 30 May 2012 13:28:55 +0000 (15:28 +0200)]
Changed tests to work from install directory

  - Changed tests to use TESTDATA

Change-Id: Iee07e4a98d2617e1bce4a3caaf67ea581479f3c7
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
11 years agoHonor -nomake for examples and demos
Tasuku Suzuki [Fri, 18 May 2012 07:35:20 +0000 (16:35 +0900)]
Honor -nomake for examples and demos

Don't build or install examples when they are disabled.

Change-Id: I0da1a1e63899103549a425e14eb64d6f4a10f136
Reviewed-by: Honglei Zhang <honglei.zhang@nokia.com>
11 years agotest: Change SRCDIR to use QFINDTESTDATA
Sergio Ahumada [Fri, 25 May 2012 11:06:50 +0000 (13:06 +0200)]
test: Change SRCDIR to use QFINDTESTDATA

Change-Id: I92455dbde3326348293c1fb37aba128ebb721acf
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
12 years agoQtXmlPatterns: Fix compiler warnings.
Friedemann Kleint [Thu, 24 May 2012 08:22:33 +0000 (10:22 +0200)]
QtXmlPatterns: Fix compiler warnings.

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>
12 years agoSimplify a type information access.
Jędrzej Nowacki [Mon, 21 May 2012 13:24:19 +0000 (15:24 +0200)]
Simplify a type information access.

Change-Id: Ife446a14400f5fcb0704f9571015e26f2f6b101a
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
12 years agoFix for exceptions being turned off by default.
Toby Tomkins [Mon, 21 May 2012 04:23:38 +0000 (14:23 +1000)]
Fix for exceptions being turned off by default.

The qtbase change 2b21dd69d6a4e47f0ec3d3958ab1def0983ce76c has turned
off exceptions by default. This change enables them for one test that
relies on them.

Change-Id: Idbbfe27595f4dc8cd7118aac66203fb7c228003c
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoFixed -qtnamespace compilation issues.
Rohan McGovern [Tue, 15 May 2012 05:52:26 +0000 (15:52 +1000)]
Fixed -qtnamespace compilation issues.

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>
12 years agoExplicitly enable exceptions
Lars Knoll [Wed, 9 May 2012 16:45:46 +0000 (18:45 +0200)]
Explicitly enable exceptions

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>
12 years agoDoc: Fix \sa usage
Marius Storm-Olsen [Thu, 10 May 2012 12:12:12 +0000 (14:12 +0200)]
Doc: Fix \sa usage

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>
12 years agoqxmlquery: Update incorrect test data for incorrect test.
Toby Tomkins [Thu, 10 May 2012 07:36:44 +0000 (17:36 +1000)]
qxmlquery: Update incorrect test data for incorrect test.

The test is converting bytearray data to a string value, this is correct
when compared against the test data, but not when compared against the
comments in the code. This started to fail due to the default QString
codec changing from latin1 to utf8.

Task-number: QTBUG-25711

Change-Id: Ied540bdadb395de388de7baadc99217ff4acf734
Reviewed-by: Honglei Zhang <honglei.zhang@nokia.com>
12 years agoChange remaining uses of {to,from}Ascii to {to,from}Latin1 [other]
Thiago Macieira [Thu, 3 May 2012 13:13:46 +0000 (15:13 +0200)]
Change remaining uses of {to,from}Ascii to {to,from}Latin1 [other]

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>
12 years agoQAbstractItemModel::reset is deprecated.
Thiago Macieira [Thu, 3 May 2012 13:13:03 +0000 (15:13 +0200)]
QAbstractItemModel::reset is deprecated.

Remember to properly notify that the model is resetting *before* we
start to reset it.

Change-Id: I88931c60ff5800b53f23a63c3766d7c705845cca
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoDon't use the QRegExp methods that modify the object
Thiago Macieira [Mon, 23 Apr 2012 14:29:18 +0000 (16:29 +0200)]
Don't use the QRegExp methods that modify the object

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>
12 years agoUpdate XmlPatterns test suite script
Honglei Zhang [Mon, 2 Apr 2012 11:25:46 +0000 (14:25 +0300)]
Update XmlPatterns test suite script

Remove obsolete code related with p4. Update the test suite download
script. wget is preferred than cvs.

Change-Id: Ic8b2ae43862371b792f95f0afc3032ee9d04b394
Reviewed-by: Honglei Zhang <honglei.zhang@nokia.com>
12 years agoDoc: Remove documentation moved to QtXml.
Casper van Donderen [Sat, 21 Apr 2012 07:26:43 +0000 (09:26 +0200)]
Doc: Remove documentation moved to QtXml.

The XML Processing document mostly deals with items in Qt XML. Since we
cannot cross-reference from Qt XML to Qt XML Patterns when the
documentation is modularized it is necessary to move the document.

Change-Id: Idc5c2c7a176493b898bee1bdbf92283186cdfd77
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
12 years agoUse the new QUrl API
Thiago Macieira [Wed, 19 Oct 2011 22:21:08 +0000 (00:21 +0200)]
Use the new QUrl API

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>
12 years agoUse a QMap instead of a QHash for the regexp flags
Thiago Macieira [Fri, 20 Apr 2012 11:59:30 +0000 (13:59 +0200)]
Use a QMap instead of a QHash for the regexp flags

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>
12 years agoFixed all qdoc errors for this module (except those related to linking)
Arnab Datta [Fri, 30 Mar 2012 14:33:48 +0000 (16:33 +0200)]
Fixed all qdoc errors for this module (except those related to linking)

Change-Id: I36d07a02ec8dea6bc2d538f32b28b987635c32c1
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoUntagged the following classes as they are not part of the QtXMLPatterns module
Arnab Datta [Thu, 29 Mar 2012 12:17:59 +0000 (14:17 +0200)]
Untagged the following classes as they are not part of the QtXMLPatterns module

Change-Id: I7398c2f6ef5244e568a997bca5c141292df20aaa
Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com>
12 years agoUpdate QtXmlPatterns module name in documentation
Honglei Zhang [Wed, 21 Mar 2012 11:33:00 +0000 (13:33 +0200)]
Update QtXmlPatterns module name in documentation

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>
12 years agoTagged the following files as part of the QtXmlPatterns module
Arnab Datta [Thu, 15 Mar 2012 15:36:05 +0000 (16:36 +0100)]
Tagged the following files as part of the QtXmlPatterns module

Change-Id: Ib63e31c1105779f01764f32936007216c79655e6
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoUpdate QtXmlPatterns module name in documentation
Honglei Zhang [Wed, 14 Mar 2012 12:50:44 +0000 (14:50 +0200)]
Update QtXmlPatterns module name in documentation

According to new module name convention, QtXmlPatterns is
replaced with Qt XML Patterns in all documentation.

Task-number: QTBUG-24775
Change-Id: I1951b7cc1bb47f3b9e4e73bd380ffef1196396a2
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoRemove the usage of deprecated qdoc macros.
Casper van Donderen [Thu, 1 Mar 2012 18:39:25 +0000 (19:39 +0100)]
Remove the usage of deprecated qdoc macros.

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>
12 years agoFix line endins on xmlpatterns test case data files
Miikka Heikkinen [Wed, 22 Feb 2012 13:40:04 +0000 (15:40 +0200)]
Fix line endins on xmlpatterns test case data files

Added required files to .gitattributes

Task-number: QTBUG-24450
Change-Id: Ib924221f7110f166952589c164d4b45fdeb472ee
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoWindows: Fix local file URLs in two autotests
Miikka Heikkinen [Wed, 22 Feb 2012 13:31:27 +0000 (15:31 +0200)]
Windows: Fix local file URLs in two autotests

QUrl has been made more stricter when it comes to local files, so
just giving an absolute path with drive letter as URL is not going to
work anymore, as the drive letter will be interpreted as scheme.
Fixed two failing cases related to this issue to use proper URLs.

Task-number: QTBUG-24446
Change-Id: I63afd6b5fd8531bc347316b5dbfc19e4ad7f8115
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoFixed failure of tst_xmlpatterns due to Qt plugin loading changes
Rohan McGovern [Wed, 22 Feb 2012 01:09:23 +0000 (11:09 +1000)]
Fixed failure of tst_xmlpatterns due to Qt plugin loading changes

The test tries to verify that the xmlpatterns command outputs nothing on
standard error.  Qt makes this difficult by warning about some plugins
(unrelated to xmlpatterns) using the old plugin API.

Those plugins should be updated, but the warnings are irrelevant to
xmlpatterns, so ignore them.

Change-Id: I3c8cb0145a326a82eed3db547c5ae68315ec3cf1
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
12 years agoFix for commit f42f82f435d738339ad85c1380d1167338517247
Sami Rosendahl [Thu, 2 Feb 2012 13:01:02 +0000 (15:01 +0200)]
Fix for commit f42f82f435d738339ad85c1380d1167338517247

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>
12 years agoFix QUrl handling after QUrl changes.
David Faure [Wed, 1 Feb 2012 11:06:18 +0000 (12:06 +0100)]
Fix QUrl handling after QUrl changes.

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>
12 years agoFix access to uninitialized values in QtXmlPatterns
Sami Rosendahl [Tue, 24 Jan 2012 08:43:25 +0000 (10:43 +0200)]
Fix access to uninitialized values in QtXmlPatterns

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>
12 years agoMark expected failures in tst_qxmlquery
Rohan McGovern [Tue, 31 Jan 2012 03:49:14 +0000 (13:49 +1000)]
Mark expected failures in tst_qxmlquery

Recent changes to QUrl in qtbase (e650dd3 and 27d9fef) have caused a
regression in this test.

Task-number: QTBUG-23953
Change-Id: Ibccad0c4f8d8a3aa9dcb05fef34d2c05a5d578c3
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoMake method non-inline as Symbian support is gone.
Holger Hans Peter Freyther [Sun, 29 Jan 2012 09:09:49 +0000 (10:09 +0100)]
Make method non-inline as Symbian support is gone.

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>
12 years agoPurge the Symbian support from this module
Holger Hans Peter Freyther [Sun, 29 Jan 2012 09:09:42 +0000 (10:09 +0100)]
Purge the Symbian support from this module

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>
12 years agoRemove "All rights reserved" line from license headers.
Jason McDonald [Tue, 24 Jan 2012 05:45:01 +0000 (15:45 +1000)]
Remove "All rights reserved" line from license headers.

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>
12 years agoFix delete/free mismatch in QtXmlPatterns
Sami Rosendahl [Tue, 24 Jan 2012 09:01:27 +0000 (11:01 +0200)]
Fix delete/free mismatch in QtXmlPatterns

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>
12 years agoFix build on Mac OS X
Tor Arne Vestbø [Mon, 23 Jan 2012 14:01:29 +0000 (15:01 +0100)]
Fix build on Mac OS X

We depended on the SDK library without also setting the libary include
path (only the framework include path).

Change-Id: Ia1d61bfb54f040c55bac49baa8496a88a9136880
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoUpdate obsolete contact address.
Jason McDonald [Fri, 20 Jan 2012 05:31:08 +0000 (15:31 +1000)]
Update obsolete contact address.

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>
12 years agoStop treating text files as binary files in git diffs.
Jason McDonald [Fri, 20 Jan 2012 05:34:55 +0000 (15:34 +1000)]
Stop treating text files as binary files in git diffs.

Change-Id: I2d4db4f0a2363113a11e064a8005a72a25991d69
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
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>
12 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>
12 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>
12 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>
12 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>