aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* We need to set the OpenGLSurface surface type on QSGCanvas.Samuel Rødal2011-09-151-0/+2
| | | | | | | Change-Id: Ib0ea343399b703c3437603918d97fc925e2adc4c Reviewed-on: http://codereview.qt-project.org/4908 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
* Remove unnecessary updateInputContext function from QSGCanvasPrivateJoona Petrell2011-09-152-12/+0
| | | | | | | Change-Id: Ibc64ef8a90854edf2c4b341ba01afdac19a813e1 Reviewed-on: http://codereview.qt-project.org/4742 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Pass Qt::ImQueryInput instead of Qt::CursorRectangle in ↵Joona Petrell2011-09-151-1/+1
| | | | | | | | | | | | | | QSgItem::updateMicroFocus function QPlatformInputContext::update() function takes QInputMethodQueries flag as a parameter. When cursor rectangle changes many input method query attributes like cursor rectangle, cursor position, surrounding text, current selection and a position change as well. New composite query ImQueryInput encapsulates this. Change-Id: I83b17507f22fcbec0d8ed50588c67794d62f9495 Reviewed-on: http://codereview.qt-project.org/4741 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Update QtQuick 2 "What's New" docs.Martin Jones2011-09-151-16/+66
| | | | | | | Change-Id: I46714a94ea88436e90d7e3eafbc2953940c5fa94 Reviewed-on: http://codereview.qt-project.org/4932 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fixed compile of qtdeclarative examples.Rohan McGovern2011-09-152-4/+4
| | | | | | | Change-Id: I3a982de8eaf31267a4d90e3cc3bedbf87400d34a Reviewed-on: http://codereview.qt-project.org/4847 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Fix anchorRewindBug test failure.Michael Brasser2011-09-151-1/+5
| | | | | | | | | Task-number: QTBUG-21396 Change-Id: Ie4397242a953a3b1504873b7fbc63719d0e99081 Reviewed-on: http://codereview.qt-project.org/4927 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Test fixes.Michael Brasser2011-09-1548-73/+66
| | | | | | | Change-Id: Icaf5f287ce5f8fe954c55ec7a60308659ccce547 Reviewed-on: http://codereview.qt-project.org/4935 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fixed compile on mac (workaround for build system bug)Rohan McGovern2011-09-151-0/+13
| | | | | | | | | | | | | | | | | When using QT += somemodule, and using frameworks on mac, qmake refuses to add `-framework somemodule' to the compiler flags unless the framework can be found on disk. This can easily break when compiling two frameworks out of the same source tree. In this case, if QtQuick1 were qmake'd prior to QtDeclarative being built (which is expected for a clean build), it would incorrectly put -lQtDeclarative into the link line even if QtDeclarative should be built as a framework. The problem would disappear if qmake was re-run. Change-Id: I79cbfc454e0ab564ce6597b4f7e613c1ff39473f Reviewed-on: http://codereview.qt-project.org/4938 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Disable compilation of tests/auto/qmltestRohan McGovern2011-09-151-2/+2
| | | | | | | | | | QtQuickTest has currently been disabled, so this test cannot be compiled. Change-Id: I93171125fafe58d925925aa6575290dab9122d4a Reviewed-on: http://codereview.qt-project.org/4845 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Charles Yin <charles.yin@nokia.com>
* commented out broken autotestsMatthew Cattell2011-09-141-21/+21
| | | | Change-Id: I8bc382afc90c0a1bda0aaab6ab5284560fdfa7d4
* marked some tests as insignificant for nowMatthew Cattell2011-09-1415-13/+32
| | | | Change-Id: I2c309d3a8da30ce2c2fa8529c76e1b3a26226d54
* Fixed failing test in QSGFocusScope.Matthew Cattell2011-09-142-16/+6
| | | | | | added some waits and removed unnecessary lines from autotest Change-Id: I847bde6db5222b12d0f0b88a8c323fd09aad9d7c
* fixed broken testMatthew Cattell2011-09-141-1/+1
| | | | Change-Id: I75655620bcd12b9a59eedde0bad489c4d31bbb2e
* fix declarative to work after broken refactorGunnar Sletta2011-09-137-45/+62
| | | | Change-Id: I5a30f8c45e21344060ea6e61d440d6fea822f9de
* Merge branch 'refactor'Gunnar Sletta2011-09-13249-2270/+2755
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/items/context2d/qsgcanvasitem.cpp src/declarative/items/context2d/qsgcontext2d.cpp src/declarative/items/context2d/qsgcontext2d_p_p.h src/declarative/particles/qsgcustomparticle.cpp src/declarative/particles/qsgparticlesystem.cpp Change-Id: I24e81d3652368c5031305ffa7f969f9f2c249c6c
| * fixed failing autotestMatthew Cattell2011-09-121-9/+4
| | | | | | | | | | | | | | Change-Id: I3a21821ce870af75741afcb3219a552e2fc5a155 Reviewed-on: http://codereview.qt-project.org/4688 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * Fix QtDeclarative refactor branch clean compilationJoona Petrell2011-09-121-1/+1
| | | | | | | | | | | | | | Change-Id: I6a5d6cc4de7a7b50cbf49a535cd764cb07ce3c40 Reviewed-on: http://codereview.qt-project.org/4684 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Vesa Rantanen <vesa.rantanen@nokia.com>
| * changed include to use newly public qsgvertexcolormaterial headerMatthew Cattell2011-09-122-2/+2
| | | | | | | | | | | | | | Change-Id: I701b573b6c93d6e69ea6f8fc16b5913162bf9ace Reviewed-on: http://codereview.qt-project.org/4680 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * Implement QSGVertexColorMaterial::compare and make the class publicGunnar Sletta2011-09-123-10/+10
| | | | | | | | | | | | | | | | | | | | Since the opaque state is just as easily settable through the Blending flag, we ditch it Change-Id: I92598e3305bd056fdf0711f1fbd6c1be8bf88275 Reviewed-on: http://codereview.qt-project.org/4628 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
| * orient the fbo rendering the same way as other fbo rendering and enable ↵Gunnar Sletta2011-09-121-3/+6
| | | | | | | | | | | | | | | | | | multisampling Change-Id: Ibfb3bd9577efc50ca7654019638d22b9077df6bb Reviewed-on: http://codereview.qt-project.org/4627 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>
| * Clang build fix: Add "this->" to avoid undeclared identifierTakumi ASAKI2011-09-120-0/+0
| | | | | | | | | | | | | | Change-Id: I0957e61b34c4b43fd50b6051db599adf7ebb4306 Reviewed-on: http://codereview.qt-project.org/4549 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
| * Merge branch 'master' into refactorGunnar Sletta2011-09-121533-46652/+40183
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/declarative/cppextensions/qwidgets/qwidgets.pro examples/declarative/minehunt/main.cpp examples/declarative/minehunt/minehunt.pro src/declarative/items/context2d/qsgcontext2d.cpp src/declarative/items/qsgflickable.cpp src/declarative/items/qsgtextedit.cpp src/declarative/items/qsgtextinput.cpp src/declarative/particles/qsgangleddirection.cpp src/declarative/particles/qsgcumulativedirection.cpp src/declarative/particles/qsgcumulativedirection_p.h src/declarative/particles/qsgfollowemitter.cpp src/declarative/particles/qsgmodelparticle.cpp src/declarative/particles/qsgparticlesystem.cpp src/qtquick1/util/qdeclarativeview.h tests/auto/declarative/examples/examples.pro tests/auto/declarative/qsgfocusscope/tst_qsgfocusscope.cpp Change-Id: Ib4be2a5e742dee1a399d73da97161736f77448e5
| * | fixed autotestMatthew Cattell2011-09-091-26/+13
| | | | | | | | | | | | | | | | | | | | | removed debug statements Change-Id: Id09e3a6a43b5d5170d8b50b10cc35eb8c4e1f3d0 Reviewed-on: http://codereview.qt-project.org/4472 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | Make QSGItem::update() work when called from inside ↵Paul Olav Tvete2011-09-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QSGCanvasPlainRenderLoop::paint() If update was called in a function triggered by rendering, it would set the dirty flag without posting an update event. Subsequent render calls would just return without doing anything because the dirty flag was set. This could cause the applications UI to freeze up. Change-Id: Ib50403c1d9e22cc4680379f0c90fb2fcaa29c1d6 Reviewed-on: http://codereview.qt-project.org/4550 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | partial build fix of qtquick1 autotestsMatthew Cattell2011-09-0911-15/+15
| | | | | | | | | | | | | | | | | | Change-Id: Ic2106ec80e1e5402f4f9bf71cc4cf23ec4657046 Reviewed-on: http://codereview.qt-project.org/4546 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | fixup tests to build with refactorMatthew Cattell2011-09-0920-177/+146
| | | | | | | | | | | | | | | | | | Change-Id: Iab4adc9e19fab67402918bb737fff2fce6c292bd Reviewed-on: http://codereview.qt-project.org/4545 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | make quicktest build and modify to use qwindowMatthew Cattell2011-09-094-36/+37
| | | | | | | | | | | | | | | | | | Change-Id: Idebb00b828307421bcbd89d8abaa9ea1d903af47 Reviewed-on: http://codereview.qt-project.org/4542 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | Only polish once pr frameGunnar Sletta2011-09-091-2/+0
| | | | | | | | | | | | | | | | | | | | | Change-Id: I7295d0936dd220c092ed6c78b19fdf8ee3a3ce23 Reviewed-on: http://codereview.qt-project.org/4465 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Matthew Cattell <matthew.cattell@nokia.com>
| * | Explicitly ask input method to commit preedit when focus lost.Pekka Vuorela2011-09-082-12/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Takes advantage of new QInputPanel::commit() method. Change-Id: I0f09353c6ac7f5503ea9fda3a9bd79d0ae3da940 Reviewed-on: http://codereview.qt-project.org/4456 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * | uncomment testsMatthew Cattell2011-09-081-584/+584
| | | | | | | | | | | | | | | | | | | | | Change-Id: I8aea71cfddb38fe1a24a74ca736a39e3f8817a5b Reviewed-on: http://codereview.qt-project.org/4464 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | get various autotests working for refactorMatthew Cattell2011-09-086-607/+633
| | | | | | | | | | | | | | | | | | | | | Change-Id: I35a9ce1421e87351a9ce4834158d201f84280a65 Reviewed-on: http://codereview.qt-project.org/4461 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | rename QSGGeometry::stride() to sizeOfVertex for symetry with indexGunnar Sletta2011-09-087-22/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | Also support GL_UNSIGNED_INT as index type when supported by GL Change-Id: I0988e102c8a04ce6cd02fb02528204ba810f853a Reviewed-on: http://codereview.qt-project.org/4453 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | Avoid compiler warning on unused variable.Pekka Vuorela2011-09-081-1/+0
| | | | | | | | | | | | | | | | | | | | | Change-Id: Ie3d08e91aee8ecd369cb10a0c8d7497de559c046 Reviewed-on: http://codereview.qt-project.org/4458 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * | Fix TextInput and TextEdit software input panel on qtquick1Pekka Vuorela2011-09-082-10/+6
| | | | | | | | | | | | | | | | | | | | | Change-Id: I39da7a877cef546da69bccfcf7ee1ae2ba92b208 Reviewed-on: http://codereview.qt-project.org/4455 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * | Adjust to the changes in the QInputMethodQuery event.Lars Knoll2011-09-081-2/+9
| | | | | | | | | | | | | | | | | | | | | Change-Id: I0c160f7635c87f63990ddc519cbc966ccab65f4a Reviewed-on: http://codereview.qt-project.org/4447 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
| * | Fix TextInput and TextEdit open/closeSoftwareInputPanel functionsJoona Petrell2011-09-082-24/+8
| | | | | | | | | | | | | | | | | | | | | Change-Id: I69bac4d1ce55271685dcddcc4c8ad2f6598e7630 Reviewed-on: http://codereview.qt-project.org/4439 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * | make sure we polishItems also in plain render loopGunnar Sletta2011-09-082-5/+6
| | | | | | | | | | | | | | | | | | | | | Change-Id: Ife8ab271c77a8daeaca9463e72296714aba17df9 Reviewed-on: http://codereview.qt-project.org/4430 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * | compile againGunnar Sletta2011-09-082-4/+21
| | | | | | | | | | | | | | | | | | | | | Change-Id: If041994fdadcd24f9b002bbcf76ce50f3b56ce87 Reviewed-on: http://codereview.qt-project.org/4431 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | Rename ImMicroFocus to ImCursorrRctangleLars Knoll2011-09-082-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Also set ImhMultiLine on the TextEdit Change-Id: I563fef803660e35f39cdf1b40526356bfc0581e0 Reviewed-on: http://codereview.qt-project.org/4415 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * | Handle ImEnabled and ImHints input method queries in QSGTextInput and ↵Joona Petrell2011-09-082-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | QSGTextEdit Change-Id: I348f924f2987f1c163c89ce4eef18fe864ec665d Reviewed-on: http://codereview.qt-project.org/4407 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
| * | Fix a typo in the method nameLars Knoll2011-09-081-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8f5ca3203058dce6cc4835a5b1cd6aa0c190bcac Reviewed-on: http://codereview.qt-project.org/4406 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Vesa Rantanen <vesa.rantanen@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * | Ensure the itemTransform in QInputPanel is always up to dateLars Knoll2011-09-082-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hook into the render loop and update the itemTransform in the QInputPanel before we repaint. Change-Id: If9122ba0fbe31cff3bfcc3edc48f684cc9b16984 Reviewed-on: http://codereview.qt-project.org/4405 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Vesa Rantanen <vesa.rantanen@nokia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
| * | Adapt to the input method changes in qtbaseLars Knoll2011-09-083-34/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Start using the QInputPanel instead of the QPlatformInputContext. Make sure we do something with both QInputMethodEvent and QInputMethodQueryEvent. This gets input methods partially working on TextInput fields. Change-Id: I4655f5599673325ffb75207573635afccd069a65 Reviewed-on: http://codereview.qt-project.org/4404 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Vesa Rantanen <vesa.rantanen@nokia.com> Reviewed-by: Andy Nichols Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * | removed unwanted filesMatthew Cattell2011-09-080-0/+0
| | | | | | | | | | | | | | | | | | | | | Change-Id: I2785e77cfbf41e7c3a710d7990374903a6e093c8 Reviewed-on: http://codereview.qt-project.org/3413 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Andy Nichols
| * | fixed resizemodelitemMatthew Cattell2011-09-071-2/+22
| | | | | | | | | | | | | | | | | | | | | Change-Id: I5b155fc2017c1b9b0fedc7e7af398f31151dfb4d Reviewed-on: http://codereview.qt.nokia.com/4347 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | fixed clickLink and other testsMatthew Cattell2011-09-071-48/+18
| | | | | | | | | | | | | | | | | | | | | Change-Id: Iadd83093481c14c1d565933ab0d052934c119891 Reviewed-on: http://codereview.qt.nokia.com/4328 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | Fix QSGshaderEffectTexture cleanupGunnar Sletta2011-09-073-23/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | Because we often created it too early it did not have a QSGContext and would thus not clean up properly, causing crashes. Change-Id: I1f5c82c87326254885ec217aaab4f1e79d18a243 Reviewed-on: http://codereview.qt.nokia.com/4329 Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
| * | make render timing an environment variableGunnar Sletta2011-09-071-13/+26
| | | | | | | | | | | | | | | | | | Change-Id: Iadc72a0beb5e6d700b0110d11116a7533c69f311 Reviewed-on: http://codereview.qt.nokia.com/4338 Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
| * | Added QSGGeometry::Attribute::isPosition to give a hint about vertex dataGunnar Sletta2011-09-075-34/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | Also added a QSGGeomtry::sizeOfIndex() function for convenience Change-Id: If1f13afd4c1c5295dcfb00254144ef6b8b8b7878 Reviewed-on: http://codereview.qt.nokia.com/4307 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | move QSGNodeUpdater into private header where it belongsGunnar Sletta2011-09-074-42/+42
| | | | | | | | | | | | | | | | | | | | | Change-Id: I5cb12cac3d49cfd9b1682b405e65b2cdea4eb57d Reviewed-on: http://codereview.qt.nokia.com/4306 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 07:52:07 +0000