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

11 Commits

Author SHA1 Message Date
Simon Hausmann 291aea1463 Merge remote-tracking branch 'origin/5.4' into dev 
Conflicts:
	.qmake.conf
	src/qml/jsruntime/qv4context_p.h
	src/qml/jsruntime/qv4debugging.cpp
	src/qml/jsruntime/qv4engine.cpp
	src/qml/jsruntime/qv4functionobject_p.h
	src/qml/jsruntime/qv4qobjectwrapper.cpp
	src/quick/scenegraph/shaders/visualization.frag
	tests/auto/qml/qjsengine/tst_qjsengine.cpp

Change-Id: I492e8546c278f80a300a2129e9a29d861e144a30
 2015-01-16 12:46:52 +01:00
Lars Knoll d3a6412c66 Remove most of the places where getPointer() is used 
This is no longer required, and simply uglifies the code

Change-Id: Iba91a1d7735ebe23a43437f137a488423b6eb743
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2014-12-20 07:39:55 +01:00
Lars Knoll 05bf96997c Return Heap::ExecutionContext for globalContext() 
Change-Id: Ide7c81735be4662ff45bf268cfe750ff1f784453
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2014-12-19 18:52:07 +01:00
Erik Verbruggen d2f4be34c7 QMLJS: remove unused/unsupported command-line options 
Change-Id: I9710a20752c318a0572aef43779c0289bedf0aa5
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2014-12-19 10:32:16 +01:00
Lars Knoll 4322c8d768 Better encapsulate access to the global object 
Change-Id: I8a76112d821cb3fc172ba0d16ee8410d39b4422a
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2014-12-11 08:40:48 +01:00
Lars Knoll ddfe9defa8 Encapsulate accesses to the root context 
Change-Id: I668cef1363a5c1a5c5b9a7e138f3bd0338712eea
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2014-12-11 08:40:41 +01:00
Lars Knoll 3dc7b5ddf6 Cleanup exception catching code 
Change-Id: I85afd5758f72e19c280dc196601ee145f0c25f01
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2014-11-15 13:16:28 +01:00
Lars Knoll 7cc5fb2b53 Cleanup: remove Value::toString/Object overloads taking a context 
Change-Id: I4cb63c3cc4eb9bb81f10f9826f80e581b4e1990c
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2014-11-15 11:25:09 +01:00
Lars Knoll ef8ad8234b Move Data of FunctionObject and related classes into Heap 
Change-Id: Iadf74f953798c1884e0ec704ccb7c70d971e3273
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2014-11-08 19:47:34 +01:00
Jani Heikkinen e7ceacda70 Update license headers and add new licenses 
- Renamed LICENSE.LGPL to LICENSE.LGPLv21
- Added LICENSE.LGPLv3 & LICENSE.GPLv2
- Removed LICENSE.GPL

Change-Id: I84a565e2e0caa3b76bf291a7d188a57a4b00e1b0
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2014-08-25 11:28:46 +02:00
Erik Verbruggen d10b97563f Rename main.cpp to qmljs.cpp. 
Finding the one "right" main.cpp (when there are 90 of them) is hard. So
give at least this important one a good name.

Change-Id: I121f8cbd67bfa9e8ba9ccac384eed45eb46f0b75
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2014-07-23 17:22:41 +02:00