summaryrefslogtreecommitdiffstats
path: root/tests/auto/qxmlquery/qxmlquery.pro
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-07-151-1/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebCore/bridge/qt/qt_instance.cpp src/3rdparty/webkit/WebCore/bridge/qt/qt_runtime.h src/3rdparty/webkit/WebCore/page/FrameView.cpp src/3rdparty/webkit/WebCore/page/FrameView.h src/3rdparty/webkit/WebCore/platform/ScrollView.cpp src/3rdparty/webkit/WebCore/platform/ScrollView.h src/corelib/plugin/quuid.cpp src/gui/dialogs/qfontdialog.cpp src/multimedia/audio/qaudiodevicefactory.cpp src/opengl/qgl.cpp src/openvg/qpaintengine_vg.cpp tests/auto/qxmlquery/tst_qxmlquery.cpp
| * Fix QXmlQuery autotest on SymbianShane Kearns2010-07-011-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | Deployment of the test files to ../xmlpatterns resolves to c:/private/xmlpatterns, which is an illegal location to deploy to on symbian. Changed the deployment and test to put the xmlpatterns directory inside the app's private directory on symbian Regression tested on windows build. Reviewed-by: mread
* | Various fixes to autotests when using the symbian/linux-armcc mkspec.axis2010-06-291-1/+1
|/
* Fixed SRCDIR for qxmlquery autotest for SymbianJanne Anttila2009-08-111-4/+4
|
* Merge commit 'qt/master-stable'Jason Barron2009-08-101-0/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.cpp src/corelib/tools/qsharedpointer_impl.h src/gui/widgets/qdatetimeedit.cpp src/gui/widgets/qlinecontrol.cpp src/gui/widgets/qlineedit.cpp tests/auto/qcssparser/qcssparser.pro tests/auto/qicoimageformat/tst_qicoimageformat.cpp tests/auto/qmultiscreen/qmultiscreen.pro tests/auto/qresourceengine/qresourceengine.pro tests/auto/qresourceengine/tst_qresourceengine.cpp tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
| * Fix QXmlQuery autotestsPeter Hartmann2009-08-061-0/+6
| | | | | | | | | | | | | | | | before, it asserted; now, the test is not asserting anymore but still failing, because the fix is not yet checked in. Additionally, it now runs from a shadow directory. Reviewed-by: TrustMe
| * Long live Qt!Lars Knoll2009-03-231-0/+23
|
* Long live Qt for S60!axis2009-04-241-0/+23