aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/testlib
Commit message (Collapse)AuthorAgeFilesLines
...
* qmltest: Fix SignalSpy to use TestUtil helper functionsCaio Marcelo de Oliveira Filho2011-08-031-1/+5
| | | | | | | | | | | Previously the callerFile() and callerLine() functions were exposed as properties of the QtTest module, but now they are available in the TestUtil component. TestCase was updated but SignalSpy wasn't. Change-Id: Ic3f35e6f096b28c443e8aadaa78732a8a15dc284 Reviewed-on: http://codereview.qt.nokia.com/2528 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Charles Yin <charles.yin@nokia.com>
* Merge the QJSEngine and QJSValue development branch into master.Simon Hausmann2011-07-292-5/+3
| | | | | | | | | | | | This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* fix qmltest bugsCharles Yin2011-07-203-6/+50
| | | | | | | Change-Id: If814516b1094b85fba46e215b44e1a2b582179c5 Reviewed-on: http://codereview.qt.nokia.com/1858 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Charles Yin <charles.yin@nokia.com>
* Fixed compile (for certain configurations)Rohan McGovern2011-07-201-1/+1
| | | | | | | | | | | | | | | | | | | | This project tried to use libQtTest, but omitted `QT+=testlib'. In most configurations, this didn't matter, because: - for includes, QtQuickTest has copied the content of some QtTest headers, instead of #including them, so the bad INCLUDEPATH went unnoticed - for libraries, libQtTest would be pulled in implicitly either via .prl files or via the system's linker, so the bad LIBS went unnoticed Change-Id: Ie3286718789758bfb80f6832aac7c08bdd85212a Reviewed-on: http://codereview.qt.nokia.com/1812 Reviewed-by: Jonni Rainisto <jonni.rainisto@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Merge branch 'v8'Aaron Kennedy2011-07-084-67/+66
|\ | | | | | | | | | | | | | | Conflicts: src/declarative/qml/qdeclarativescarceresourcescriptclass.cpp src/declarative/qml/qdeclarativescarceresourcescriptclass_p.h Change-Id: I54e579307cbeafbbad21884218c5e797ba245c8b
| * windowShown is a property of qtest, not util.Charles Yin2011-06-231-1/+1
| | | | | | | | Change-Id: I3d96b6bd43fc8fdfdf9a916032efd9a7360aafba
| * get the caller file & line number from v8 stack trace.Charles Yin2011-06-234-67/+66
| | | | | | | | Change-Id: I0ffebd2d22702bc14e1629b8bc0455a9cf8ea416
* | Update licenseheader text in source files for qtdeclarative Qt moduleJyri Tahtela2011-07-088-136/+136
|/ | | | | | | | Replace old license header with correct one. Change-Id: I492ddaaa0227b2c8faf11bdcd6e12e7231a54a10 Reviewed-on: http://codereview.qt.nokia.com/1312 Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* fix shadow build errorCharles Yin2011-05-301-0/+4
| | | | Change-Id: I68c8edac98389c487c1ac09bb74d43fdeb85cdc3
* Compile fix.Kim Motoyoshi Kalland2011-05-301-4/+0
|
* copy other .qml .js files during build timeCharles Yin2011-05-301-4/+21
| | | | Change-Id: I08db54c7cd5d2ae7bbad28440cc36f6332a190c9
* Integrate QtQuickTest into QtCharles Yin2011-05-2010-0/+1984
Change-Id: I558821c0dec9166ea1d0d2e1e2f889553c436316 Task-number:QTBUG-16082
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 12:52:04 +0000