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

1700 Commits

Author SHA1 Message Date
Qt Continuous Integration System 67eeff8459 Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging 
* 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging:
  Remove Qt3Support code from qtdeclarative module
 2011-05-20 12:14:17 +10:00
Jason McDonald d2a49efb79 Remove Qt3Support code from qtdeclarative module 
Change-Id: I7da1286486a138042717241461062883aacc6250
Task-number: QTBUG-19325
Reviewed-by: Rohan McGovern
 2011-05-20 12:09:22 +10:00
Charles Yin daf671b422 Integrate QtQuickTest into Qt 
Change-Id: I558821c0dec9166ea1d0d2e1e2f889553c436316
Task-number:QTBUG-16082
 2011-05-20 12:07:23 +10:00
Martin Jones 9bf28fbf0e Some of the QML C++ methods should be slots. 
Change-Id: Ib9465cf2a7638d013ce831f49ed0177741c22ab0
 2011-05-20 11:37:58 +10:00
Yann Bodson 1ffe4f1b24 Skip test in qdeclarativeimage::noLoading (QTBUG-19425) 2011-05-20 11:36:30 +10:00
Martin Jones 58e5b72447 Skip another pixmap comparison test. 
Change-Id: Ie9280cfbb74d2ffa2da1ce5b6d1e5153a9b19d0f
 2011-05-20 10:36:31 +10:00
Kim Motoyoshi Kalland fa128f5252 Avoid using indices in the RectangleNode implementation. 
Task-number: QTBUG-18731
 2011-05-19 16:09:32 +02:00
Casper van Donderen defb7bc3e4 Fix typo. 2011-05-19 16:08:24 +02:00
Kim Motoyoshi Kalland 65e9403ca1 Improved RectangleNode implementation. 
Task-number: QTBUG-18731
 2011-05-19 15:32:40 +02:00
Casper van Donderen c35f95c646 Add .pro file to fix build. 
Reviewed-by: Kevin Wright
 2011-05-19 14:49:30 +02:00
Casper van Donderen fafbc9f51b Add TextBalloon QML Scene Grpah example with documentation. I moved an old example over to a subfolder. 
Reviewed-by: Gunnar Sletta
 2011-05-19 11:27:26 +02:00
Alan Alpert 56d80e1590 Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2 2011-05-19 18:43:59 +10:00
Alan Alpert 29017e818e Add BurstEmitter, and a simple render path for UltraParticles 
None of the intermediate paths are written though. It's all or virtually
nothing.
 2011-05-19 18:43:12 +10:00
Kim Motoyoshi Kalland 13970487ff Update unit test according to intended behaviour change. 
The behaviour was changed in commit
9d7eb51da3.
 2011-05-19 10:36:34 +02:00
Kim Motoyoshi Kalland 9d7eb51da3 Re-apply "Support mirroring the source rectangle of ShaderEffectSource." 
This reverts commit 616c7e768f.
 2011-05-19 10:26:55 +02:00
Alan Alpert fcdd4d4dd5 Normalize createQmlObject error message 2011-05-19 18:02:21 +10:00
Martin Jones 6dcf673062 Fix unstable test. 
Change-Id: I336b6a02b763c3be9b01a074f641cb031cf18268
 2011-05-19 17:24:07 +10:00
Martin Jones d774fc5f25 Link item focus to canvas widget focus. 
Change-Id: I7da1db30819c80b48f4c285a43274b668c686826
 2011-05-19 17:22:19 +10:00
Andrew den Exter af5facf92d Remove QEXPECT_FAIL from QSGTextInput test. 
The QSGPaintedItem::setContentSize() function has now been implemented.

Change-Id: I620824073143de5e50c8ce2e4f886dc60dd79e64
 2011-05-19 13:59:40 +10:00
Kim Motoyoshi Kalland acbc84876a Fixed crash when Image/ShaderEffectSource source is missing. 2011-05-18 17:49:06 +02:00
Kim Motoyoshi Kalland 7ef7dd68dc Added documentation for GridMesh. 2011-05-18 15:09:41 +02:00
Alan Alpert 1edb32e75d Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2 2011-05-18 21:11:51 +10:00
Alan Alpert b8338a1881 Add UltraParticle 
They're not as cool as they sound. Includes example, and the now
pointless SuperParticle (for possible performance comparisions).
 2011-05-18 21:10:00 +10:00
Andrew den Exter 57d9b5d3ca Fix test TextEdit preeditMicroFocus test failure. 
Port change from QDeclarativeTextEdit test which removed a check for
an update when the cursor position had not changed.
 2011-05-18 17:00:49 +10:00
Yann Bodson c83c123579 Skip mirror autotests while QTBUG-19351 and QTBUG-19252 are not resolved. 2011-05-18 16:16:00 +10:00
Martin Jones 5a59bc11bc Make SG Text test work by disabling pixmap comparison. 
This won't work with scenegraph.  Manual test needed.
 2011-05-18 14:25:10 +10:00
Yann Bodson dbf003e314 More autotests fixes. 2011-05-18 14:16:44 +10:00
Charles Yin 2e68186a80 show initial chart in motion chart example 
Change-Id: I39297ced1c532f633a7c9c6c64c0818bbc852084
 2011-05-18 13:46:16 +10:00
Charles Yin 8df66dbeb5 fix motion chart example bug 
Change-Id: I0d00d224d815210c8ef45f2289e9ec4d0adea6b5
 2011-05-18 13:32:13 +10:00
Yann Bodson a183d3a036 Fix QSGBorderImage autotest. 
QtQuick 1.0 -> QtQuick 2.0
 2011-05-18 13:23:05 +10:00
Chris Adams 616c7e768f Revert "Support mirroring the source rectangle of ShaderEffectSource." 
This reverts commit 155faa3b8b.
The original commit broke behavior enforced by the tst_qdeclarativeqt
unit test, specifically relating to QRectF.
 2011-05-18 12:32:28 +10:00
Charles Yin d90a4c05c3 add motion chart canvas example 
Change-Id: Iccce2c4fc2bdeb4289093fa9675440eff589ae41
 2011-05-18 12:04:26 +10:00
Jason McDonald 11baecf600 Reduce usage of Q_ASSERT in autotests. 
Using Q_ASSERT does nothing in release-mode builds, and in debug builds
it causes tests to terminate prematurely.  It is much better to use
QVERIFY or QCOMPARE.

Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 3475168550c1a804f04f2a4edfeb30c04cd36551)
 2011-05-18 11:00:07 +10:00
Jason McDonald 939ef5eb38 Remove Q_ASSERT from qdeclarativexmllistmodel test 
Report a meaningful warning in all builds rather than aborting in debug
builds and doing nothing in release builds.

Change-Id: I14aa7bc8699f5307e1ec34b18006b9fbbd8aca8e
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 1ea84cba1f90a9c95c54480117342dba0eae3d2f)
 2011-05-18 10:59:11 +10:00
Jason McDonald d0d61b454a Remove Q_ASSERT's from ecmascript test. 
These Q_ASSERT's were redundant as the test functions that call these
functions already verify that "value == 0".

Change-Id: Ic23e539c5814153d67fea8156ade0783f91d7b83
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 6f791f8ad0b7ef023d91c1609ce076443f335c13)
 2011-05-18 10:59:11 +10:00
Jason McDonald d4ccaaa83a Remove Q_ASSERT from QDeclarativeListModel autotest. 
Change-Id: Ic15b747fa50bcec54df748b173b299058f69c681
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 59a6e6200984ccbb862b8758436a5e88b8c40bbc)
 2011-05-18 10:59:11 +10:00
Jason McDonald afdaa492ea Remove redundant Q_ASSERT from qmlvisual autotest. 
Change-Id: I5c413793ee6322b5be1ae52658362803dc4c2010
Task-number: QTBUG-17582
Reviewed-by: Alan Alpert
(cherry picked from commit d6bd4db2db6dbefec327e226bf54a69a20690a45)
 2011-05-18 10:59:10 +10:00
Jason McDonald 891b216c31 Remove Q_ASSERT calls that wrap side-effecting code. 
In release mode builds, code inside Q_ASSERT macros is not executed, so
putting code with side-effects inside Q_ASSERT is not a good idea.

Task-number: QTBUG-17582
Change-Id: I1a5d8ccce666ee7b7f120bf9cbb49e30dac9add4
Reviewed-by: Rohan McGovern
(cherry picked from commit 1750a4351a8125756bf38a53d6d8312993c7d85e)
 2011-05-18 10:59:10 +10:00
Yann Bodson 60204c8325 Add autotests to .pro file 2011-05-17 16:07:14 +10:00
Yann Bodson 264c267f8d Make QSGImage autotests compile. 2011-05-17 15:51:46 +10:00
Charles Yin 7740c4c9a1 skip unit tests if no required OpenGL 2.0 feature on this platform 
Change-Id: I68feb5938339f327b45cf66b7aec1c582753f18d
 2011-05-17 14:55:32 +10:00
Alan Alpert ab858bc8e6 Fix emitter burst method bugs 
Burst will now always burst at the x,y where it was called, and doesn't
leave trails between close bursts. Kill affector also gets a fix for
double killing things sometimes.
 2011-05-17 13:48:20 +10:00
Martin Jones 2257e544e1 Apply 2081a3d0fd to SG TextInput 2011-05-17 09:17:36 +10:00
Kim Motoyoshi Kalland 3c600f0b6e Added documentation for ShaderEffectItem. 
Also removed unused signal.
 2011-05-16 17:10:34 +02:00
Kim Motoyoshi Kalland 4d71dedf53 Added documentation for ShaderEffectSource. 2011-05-16 12:12:33 +02:00
Yann Bodson 9124339924 Compile without qt3support 2011-05-16 14:10:11 +10:00
Alan Alpert 12a43977ff Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2 2011-05-16 13:23:22 +10:00
Yann Bodson c05668a436 Fix QSGBorderImage and QSGAnimatedImage autotests 2011-05-16 13:21:16 +10:00
Alan Alpert 2081a3d0fd Update QDeclarativeTextInput to match accessibility changes 
Reviewed-by: Martin Jones
 2011-05-16 13:15:38 +10:00
Aaron Kennedy 220b2384a5 Doc 
Change-Id: I25f1885ef285fb3bd14c1f499b9f42e38bba5ec6
Task-number: QTBUG-19265
(cherry picked from commit 01a374fe8a6ac0b6e374081c07720e77c61effff)
 2011-05-16 11:16:12 +10:00