Commit Graph

132 Commits

Author SHA1 Message Date
Friedemann Kleint fbddf793e9 QtDeclarative/Quick: Fix warnings.
Change-Id: I71bd638fcc41356e0b76df27ec76ad3ed5ef90d9
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
2012-02-16 08:31:17 +01:00
Jason McDonald 5572b4c9ed qmltest: Count passes, fails and skips consistently.
This commit changes qmltest to count one pass per data row, rather than
a single pass for an entire data-driven test function.  This makes
counting of passes consistent with counting of fails and skips which
were already counted once per data row.  This change also means that the
plain-text, xml and light-xml output formats will now show one result
per data row, so that every data row executed will be shown in the test
output with either a pass, fail or skip result.  Previously data rows
that passed were not shown in the output, preventing analysis of total
number of tests runs, pass-rates, and various other metrics.

This commit corresponds to (and depends on) a commit in the qtbase
module which changes the behaviour of qtestlib in the same way.

Task-number: QTBUG-21848
Task-number: QTBUG-22124
Change-Id: I3c1f0e68bdff4087b9ccfc80a3f96f4541335b6f
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
2012-02-13 04:20:25 +01:00
Jason McDonald 3233e8052d Remove code related to test location.
Testlib no longer does anything with the test location and neither do
any of Qt's tests, so this code is no longer needed.

Change-Id: Ic370b6b741382a90454c893bffcab4a7328a2f9e
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
2012-02-09 06:29:37 +01:00
Jason McDonald e8420af071 qmltest: Perform extra checks after each data row is executed.
Add calls to the new function QTestResult::finishedCurrentTestData() to
verify that expected failures and expected messages have been produced.

Change-Id: Ia139a962c705a5f47be992b7f2e81775aa2e2f28
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
2012-02-09 00:31:00 +01:00
Caroline Chao 9df2da5b9f CodeCoverage: Fix wrong type passed to saveCoverageTool.
Passing a bool as appropriate.

Change-Id: I0dcca8d30c6d75e7fcddcf7047e1dd1c572ec6ea
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
2012-02-08 15:03:25 +01:00
Matthew Vogt 01dc7e2ea4 Remove QtQuick1 elements from qtdeclarative
QtQuick1 is now contained in a separate repository.

Task-number: QTBUG-23737
Change-Id: I09eae67af5693a22b896b916f816f73ccc3a89b1
Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-02-03 00:39:18 +01:00
Jason McDonald 45b14259fc 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: If39bd256b0fa85eba17ea30f8ab87ea27d758908
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-01-30 23:52:43 +01:00
Jason McDonald e6b224aa28 Update obsolete contact address.
Replace Nokia contact email address with Qt Project website.

Change-Id: I6a730abc0c396fb545a48b2d6938abedac2e3f1c
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
2012-01-23 06:28:53 +01:00
Jason McDonald 5180186da2 Update copyright year in Nokia copyright headers.
Update copyright headers from before 2011, and a couple of new ones that
were merged after the previous change to copyright headers.

Change-Id: Ia76e08e2734afa4ef3f1207dbcda5ff3bc81b366
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-01-17 06:45:52 +01:00
Charles Yin d9ecb7345c Don't delete global app
Sometimes delete the global GUI app causes crash, this is a work around
fix.

Change-Id: Ic2406e7a085483de5d96321de8257663925b7e5e
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
2012-01-13 06:45:10 +01:00
Friedemann Kleint 424d30275c QMLTest: Fix output of file names, make output more verbose.
- Check command line arguments thoroughly.
- Change all QuickTestResult functions taking file names to
  accept QUrls and format them using QUrl::toLocalFile() in case
  of local file names in order to display Windows drive
  letters correctly.
- Introduce a template function (for QDeclarativeView, QQuickView)
  that dumps out all available information when compilation goes
  wrong.
- Skip 'Debug', 'Release' folders for Windows builds.

Change-Id: Ibdd92867870a2b05494de8a0adbe0910d4897ba2
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
2012-01-11 14:25:00 +01:00
Caroline Chao 5456784005 Integrate testcocoon support into QtQuickTest.
Add support to install and save coverage data when a test is run
using quick_test_main.

Change-Id: I39ddd678d748979c335139b3f8bda43b3d05720d
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2011-12-09 13:08:36 +01:00
Kent Hansen 6c8378eaf1 Say hello to QtQuick module
This change moves the QtQuick 2 types and C++ API (including
SceneGraph) to a new module (AKA library), QtQuick.

99% of this change is moving files from src/declarative to
src/quick, and from tests/auto/declarative to
tests/auto/qtquick2.

The loading of QtQuick 2 ("import QtQuick 2.0") is now delegated to
a plugin, src/imports/qtquick2, just like it's done for QtQuick 1.

All tools, examples, and tests that use QtQuick C++ API have gotten
"QT += quick" or "QT += quick-private" added to their .pro file.

A few additional internal QtDeclarative classes had to be exported
(via Q_DECLARATIVE_PRIVATE_EXPORT) since they're needed by the
QtQuick 2 implementation.

The old header locations (e.g. QtDeclarative/qquickitem.h) will
still be supported for some time, but will produce compile-time
warnings. (To avoid the QtQuick implementation using the
compatibility headers (since QtDeclarative's includepath comes
first), a few include statements were modified, e.g. from
"#include <qsgnode.h>" to "#include <QtQuick/qsgnode.h>".)

There's a change in qtbase that automatically adds QtQuick to the
module list if QtDeclarative is used. Together with the compatibility
headers, this should help reduce the migration pain for existing
projects.

In theory, simply getting an existing QtDeclarative-based project
to compile and link shouldn't require any changes for now -- but
porting to the new scheme is of course recommended, and will
eventually become mandatory.

Task-number: QTBUG-22889
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Change-Id: Ia52be9373172ba2f37e7623231ecb060316c96a7
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
2011-12-02 14:18:20 +01:00
Charles Yin 4b49a7ab1f Fix qmltestrunner crash bug when report filename and line number
The HandleScpe is not needed here. Also for each test file, the rootObj
should reset its internal states properly, otherwise the following test
cases are polluted by the previous tests.

Task-number:QTBUG-22620
Change-Id: I1e4869070b8712e5a6c755461d52bd12d1f03160
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
2011-11-09 11:29:42 +01:00
Friedemann Kleint c29b3c0974 Declarative: Fix gcc 4.6 warnings about assigned/unused variables.
Change-Id: Iac4bb4a6b1aa4071a239bb25f25f01b71e36868b
Reviewed-by: Alexis Menard <alexis.menard@openbossa.org>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
2011-11-01 11:52:03 +01:00
Charles Yin 0339d34691 Add I18N support to qmltestrunner
Add a new command line option "-translation file" to handle translation
files to qmltestrunner.

Task-number:QTBUG-22390
Change-Id: I351ed41734c79a51e00aeef551af642482bf36f2
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
2011-10-28 22:31:56 +02:00
Charles Yin ec0402116c Fix qmltestrunner hang bug when no TestCase item
Add a hasTestCase property to the global qtest object, set it to true
in each TestCase's onCompleted handler. qmltestrunner only enter the
event loop if this property is true to avoid infinite waiting.

Task-number:QTBUG-22281
Change-Id: Id609432210ae795d8c128901e64ba0aef4551f01
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
2011-10-24 03:02:19 +02:00
Kent Hansen bfb3c424ab Rename Qt Quick-specific classes to QQuick*
The QSG (SceneGraph) prefix is too generic for
Qt Quick(2)-specific classes.

All the classes and files in the declarative/items
directory have been renamed.

In particular, for classes that are currently public,
the renaming is as follows:

QSGView --> QQuickView
QSGCanvas --> QQuickCanvas
QSGItem --> QQuickItem
QSGPaintedItem --> QQuickPaintedItem

The header files have been renamed accordingly
(e.g. qsgview.h --> qquickview.h).

Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-21 11:53:26 +02:00
Charles Yin 8cbd59e253 only use one QSGView instance for all qml test cases
Change-Id: I9296e30d216b57d8cf2a11e94030781f03594aa6
Reviewed-on: http://codereview.qt-project.org/6646
Reviewed-by: Charles Yin <charles.yin@nokia.com>
2011-10-14 05:08:43 +02:00
Charles Yin 08d8fe791b make it possible to run single qml test case file by passing a tst_*.qml file to -input option
Change-Id: I8376ca0ae23d4366d69e0e7f3c95593ba54fc71d
Reviewed-on: http://codereview.qt-project.org/6273
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
2011-10-10 05:47:52 +02:00
Matthew Cattell d93cc35d4f make quicktest build and modify to use qwindow
Change-Id: Idebb00b828307421bcbd89d8abaa9ea1d903af47
Reviewed-on: http://codereview.qt-project.org/4542
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
2011-09-09 15:00:47 +02:00
Gunnar Sletta 7147835237 Merge branch 'master' into refactor
Conflicts:
	src/3rdparty/v8
	src/declarative/declarative.pro
	src/declarative/items/qsgcanvas.cpp
	src/declarative/items/qsgshadereffectsource_p.h
	src/declarative/items/qsgview.cpp
	src/declarative/particles/qsgcustomparticle.cpp
	src/imports/gestures/gestures.pro
	src/imports/particles/particles.pro
	src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro
	src/qtquick1/qtquick1.pro
	tests/auto/declarative/examples/examples.pro
	tests/auto/declarative/qsglistview/qsglistview.pro
	tests/auto/qtquick1/qdeclarativeviewer/qdeclarativeviewer.pro

Change-Id: I423344f83e1835116cad531b877fde6e68a8849a
2011-08-31 08:55:16 +02:00
Samuel Rødal 957c8fb994 Get declarative running on new gui/opengl stack.
Rename QGuiGLContext -> QOpenGLContext, QGL* -> QOpenGL*, etc.

Change-Id: I08379029d756e28b20ae141ca30ed801626b513d
Reviewed-on: http://codereview.qt.nokia.com/3711
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
2011-08-29 10:25:51 +02:00
Kai Koehne 33ecffd4e2 Deprecate QDeclarativeDebugHelper class
This was a helper class for enable debugging in 4.7. Since Qt 4.8 you
should just say CONFIG += declarative_debug

Change-Id: I51dabaec36e175a097721570061aad38c3f828d1
Reviewed-on: http://codereview.qt.nokia.com/3507
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2011-08-26 12:13:45 +02:00
Charles Yin 12aae0aab3 parse args earlier
Change-Id: Ie0869d3f70d1e898a9b0635e28bcad2e92fa607c
Reviewed-on: http://codereview.qt.nokia.com/2718
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
2011-08-08 03:37:54 +02:00
Charles Yin 16fc17f9eb don't create QApplication if there is already one there
Change-Id: Iaf9ebf6855992962abfb3452dc398149af15bbbc
Reviewed-on: http://codereview.qt.nokia.com/2711
Reviewed-by: Charles Yin <charles.yin@nokia.com>
2011-08-08 02:13:20 +02:00
Simon Hausmann d410ad364e Merge the QJSEngine and QJSValue development branch into master.
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>
2011-07-29 13:00:52 +02:00
Martin Jones 4442dea01b Extract all QtQuick 1 elements into a separate library/plugin.
Change-Id: I41a280de2739ee08202f4be2519e5012870090f2
Reviewed-on: http://codereview.qt.nokia.com/1391
Reviewed-by: Martin Jones <martin.jones@nokia.com>
2011-07-12 06:38:09 +02:00
Aaron Kennedy 26590325b5 Merge branch 'v8'
Conflicts:
	src/declarative/qml/qdeclarativescarceresourcescriptclass.cpp
	src/declarative/qml/qdeclarativescarceresourcescriptclass_p.h

Change-Id: I54e579307cbeafbbad21884218c5e797ba245c8b
2011-07-08 15:56:48 +10:00
Jyri Tahtela 5a705d8951 Update licenseheader text in source files for qtdeclarative Qt module
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>
2011-07-08 02:45:03 +02:00
Charles Yin 9ebf3d12a1 get the caller file & line number from v8 stack trace.
Change-Id: I0ffebd2d22702bc14e1629b8bc0455a9cf8ea416
2011-06-23 11:39:56 +10:00
Charles Yin daf671b422 Integrate QtQuickTest into Qt
Change-Id: I558821c0dec9166ea1d0d2e1e2f889553c436316
Task-number:QTBUG-16082
2011-05-20 12:07:23 +10:00