qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,529 Commits 82 Branches 266 Tags 290 MiB
Commit Graph

10 Commits

Author SHA1 Message Date
Jason McDonald 8f72ef77d1 Remove copy of tests/shared/util.h. 
This module has a copy of qtbase's tests/shared/util.h, the contents of
which have been moved into qtestlib and are now accessible from the
QtTest/QtTest header.

Change-Id: I0be9e21dc9f30629dad283a740b9d80347e01140
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2011-10-19 08:55:39 +02:00
Michael Brasser 6b497734df Use TESTDATA macro in declarative tests. 
Includes a few other minor cleanups as well.

Task-number: QTBUG-21721
Change-Id: I5b1c2c116e63748c6b4199183212de8a00037af1
Reviewed-on: http://codereview.qt-project.org/6473
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2011-10-14 02:39:59 +02:00
Jason McDonald b1e650a889 Remove Symbian-specific code from tests. 
Symbian is not a supported platform for Qt5, so this code is no longer
required.

Change-Id: I5cb6d3b41fbb9fa5fea6176ad949e4e7be7c30b5
Reviewed-on: http://codereview.qt-project.org/5767
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2011-09-30 10:37:05 +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 53085399f5 Dispose of WorkerScripts in correct Isolate 
We were disposing them in the main thread isolate which caused
corruption of the v8 heap.  Specifically this showed in asserting
allocations of persistent handles.
 2011-06-07 17:00:11 +10:00
Michael Brasser 26942a682c Merge branch 'master' into v8 
Conflicts:
	src/declarative/graphicsitems/qdeclarativeitem.cpp
	src/declarative/qml/qdeclarativecontextscriptclass.cpp
	src/declarative/qml/qdeclarativeengine.cpp
	src/declarative/qml/qdeclarativeengine_p.h
	src/declarative/qml/qdeclarativeglobalscriptclass.cpp
	src/declarative/qml/qdeclarativeinclude.cpp
	src/declarative/qml/qdeclarativelistscriptclass.cpp
	src/declarative/qml/qdeclarativeobjectscriptclass.cpp
	src/declarative/qml/qdeclarativeobjectscriptclass_p.h
	src/declarative/qml/qdeclarativetypenamescriptclass.cpp
	src/declarative/qml/qdeclarativevaluetypescriptclass.cpp
 2011-06-07 10:15:38 +10:00
Aaron Kennedy 6b54de600c Initial V8 integration 2011-06-06 11:50:48 +10:00
Jyri Tahtela f0c87d3a1f Update licenseheader text in source files for qtdeclarative Qt module 
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.

Reviewed-by: Trust Me
 2011-05-24 14:43:28 +03:00
Qt by Nokia 885735d011 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
 2011-04-27 12:05:43 +02:00