Matthew Cattell [Thu, 8 Sep 2011 14:46:54 +0000 (16:46 +0200)]
fixed autotest
removed debug statements
Change-Id: Id09e3a6a43b5d5170d8b50b10cc35eb8c4e1f3d0
Reviewed-on: http://codereview.qt-project.org/4472
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Paul Olav Tvete [Fri, 9 Sep 2011 13:03:01 +0000 (15:03 +0200)]
Make QSGItem::update() work when called from inside 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>
Matthew Cattell [Fri, 9 Sep 2011 12:53:01 +0000 (14:53 +0200)]
partial build fix of qtquick1 autotests
Change-Id: Ic2106ec80e1e5402f4f9bf71cc4cf23ec4657046
Reviewed-on: http://codereview.qt-project.org/4546
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Matthew Cattell [Fri, 9 Sep 2011 12:50:48 +0000 (14:50 +0200)]
fixup tests to build with refactor
Change-Id: Iab4adc9e19fab67402918bb737fff2fce6c292bd
Reviewed-on: http://codereview.qt-project.org/4545
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Matthew Cattell [Fri, 9 Sep 2011 12:43:33 +0000 (14:43 +0200)]
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>
Gunnar Sletta [Thu, 8 Sep 2011 14:00:07 +0000 (16:00 +0200)]
Only polish once pr frame
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>
Pekka Vuorela [Wed, 7 Sep 2011 17:55:38 +0000 (20:55 +0300)]
Explicitly ask input method to commit preedit when focus lost.
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>
Matthew Cattell [Thu, 8 Sep 2011 13:58:13 +0000 (15:58 +0200)]
uncomment tests
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>
Matthew Cattell [Thu, 8 Sep 2011 13:35:51 +0000 (15:35 +0200)]
get various autotests working for refactor
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>
Gunnar Sletta [Thu, 8 Sep 2011 13:15:57 +0000 (15:15 +0200)]
rename QSGGeometry::stride() to sizeOfVertex for symetry with index
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>
Pekka Vuorela [Wed, 7 Sep 2011 18:32:24 +0000 (21:32 +0300)]
Avoid compiler warning on unused variable.
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>
Pekka Vuorela [Thu, 8 Sep 2011 12:12:45 +0000 (15:12 +0300)]
Fix TextInput and TextEdit software input panel on qtquick1
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>
Lars Knoll [Thu, 8 Sep 2011 12:41:51 +0000 (14:41 +0200)]
Adjust to the changes in the QInputMethodQuery event.
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>
Joona Petrell [Thu, 8 Sep 2011 09:09:22 +0000 (12:09 +0300)]
Fix TextInput and TextEdit open/closeSoftwareInputPanel functions
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>
Gunnar Sletta [Thu, 8 Sep 2011 10:36:53 +0000 (12:36 +0200)]
make sure we polishItems also in plain render loop
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>
Gunnar Sletta [Thu, 8 Sep 2011 10:37:36 +0000 (12:37 +0200)]
compile again
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>
Lars Knoll [Thu, 8 Sep 2011 08:58:45 +0000 (10:58 +0200)]
Rename ImMicroFocus to ImCursorrRctangle
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>
Joona Petrell [Wed, 7 Sep 2011 20:19:14 +0000 (23:19 +0300)]
Handle ImEnabled and ImHints input method queries in QSGTextInput and 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>
Lars Knoll [Wed, 7 Sep 2011 20:02:09 +0000 (22:02 +0200)]
Fix a typo in the method name
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>
Lars Knoll [Wed, 7 Sep 2011 19:55:47 +0000 (21:55 +0200)]
Ensure the itemTransform in QInputPanel is always up to date
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>
Lars Knoll [Wed, 7 Sep 2011 17:58:14 +0000 (19:58 +0200)]
Adapt to the input method changes in qtbase
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>
Matthew Cattell [Tue, 23 Aug 2011 14:19:23 +0000 (16:19 +0200)]
removed unwanted files
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
Matthew Cattell [Wed, 7 Sep 2011 10:47:21 +0000 (12:47 +0200)]
fixed resizemodelitem
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>
Matthew Cattell [Wed, 7 Sep 2011 09:42:08 +0000 (11:42 +0200)]
fixed clickLink and other tests
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>
Gunnar Sletta [Wed, 7 Sep 2011 09:46:12 +0000 (11:46 +0200)]
Fix QSGshaderEffectTexture cleanup
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>
Gunnar Sletta [Wed, 7 Sep 2011 10:03:20 +0000 (12:03 +0200)]
make render timing an environment variable
Change-Id: Iadc72a0beb5e6d700b0110d11116a7533c69f311
Reviewed-on: http://codereview.qt.nokia.com/4338
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
Gunnar Sletta [Mon, 5 Sep 2011 05:50:58 +0000 (07:50 +0200)]
Added QSGGeometry::Attribute::isPosition to give a hint about vertex data
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>
Gunnar Sletta [Sat, 3 Sep 2011 05:49:07 +0000 (07:49 +0200)]
move QSGNodeUpdater into private header where it belongs
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>
Matthew Cattell [Tue, 6 Sep 2011 15:41:57 +0000 (17:41 +0200)]
make test build
Change-Id: Id640db28b5a827a7f66f663684019c542987a3f4
Reviewed-on: http://codereview.qt.nokia.com/4290
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Matthew Cattell [Tue, 6 Sep 2011 15:33:55 +0000 (17:33 +0200)]
make test build
Change-Id: Ia22047e0c03290109f6d5489febcc750caea533f
Reviewed-on: http://codereview.qt.nokia.com/4285
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Matthew Cattell [Tue, 6 Sep 2011 14:36:01 +0000 (16:36 +0200)]
fixed to work with qsgcanvas
Change-Id: Ia044bb738469fdd2c9ecc6154ac51851db3e0e7f
Reviewed-on: http://codereview.qt.nokia.com/4270
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Matthew Cattell [Tue, 6 Sep 2011 11:14:37 +0000 (13:14 +0200)]
qsgcanvas autotest made to work with refactor and added break statement to qsgcanvas.cpp in event processing
amended wait times / changed include for private headers
Change-Id: I4f790907268be357986e181e4624f8e54efcb2ec
Reviewed-on: http://codereview.qt.nokia.com/4256
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Zeno Albisser [Fri, 2 Sep 2011 09:04:31 +0000 (11:04 +0200)]
properly initialize the dptr of QSGCanvas in the default constructor
Change-Id: Ibefa8fe0ca73674e817b87782821a26a316e8042
Reviewed-on: http://codereview.qt.nokia.com/4124
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Gunnar Sletta [Thu, 1 Sep 2011 10:29:17 +0000 (12:29 +0200)]
Add QSGFlatColorMaterial::compare for better sorting
Change-Id: Ic6229c777a30191ba131b3896984da4f3fecc9d5
Reviewed-on: http://codereview.qt.nokia.com/4066
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
Gunnar Sletta [Thu, 1 Sep 2011 10:29:00 +0000 (12:29 +0200)]
add flags to node debug output
Change-Id: Idc5f542a40d98b8163fb894e26e53127d1b6369c
Reviewed-on: http://codereview.qt.nokia.com/4065
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
Lars Knoll [Tue, 30 Aug 2011 11:17:00 +0000 (13:17 +0200)]
Remove the remaining dependencies onto QtWidgets
Change-Id: I49efc4d0af4c19c24515ecfaa5c549e36f442cc8
Reviewed-on: http://codereview.qt.nokia.com/3992
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Lars Knoll [Tue, 30 Aug 2011 14:48:57 +0000 (16:48 +0200)]
Use QMouseEvent instead of QGraphicsSceneMouseEvent
QMouseEvent now supports floating point coordinates, and
the graphics scene event is not be available in QtGui
anymore.
Change-Id: I28ab428a2d00fc1deef55b05c1c545e74838e105
Reviewed-on: http://codereview.qt.nokia.com/3991
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Eskil Abrahamsen Blomfeldt [Wed, 31 Aug 2011 10:47:20 +0000 (12:47 +0200)]
Support font color with Text.StyledText in SceneGraph
When Text.StyledText is set as format, QML will use a QTextLayout
back-end with additional formats to render styled text, supporting
a few HTML tags. To support color changes using this format, we
need to process the additional formats in the text node. The code
that fetches glyph runs is now separated into its own function and
is called once per color-changing format if any such exist.
Task-number: QTBUG-21199
Change-Id: Ib9b0cbec8d23de2dfafae9f641a2e3f7819c6a7a
Reviewed-on: http://codereview.qt.nokia.com/3982
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
Friedemann Kleint [Wed, 31 Aug 2011 14:43:22 +0000 (16:43 +0200)]
Fix export symbols for QtDeclarative and QtQuick1.
Fix build on Windows and compiler warnings.
Requires
090ee21eac7257644422e35395194e5fd7fb8efa in qtbase.
Change-Id: Ief8da504ccd3e2c2e78644cc9943d685c4302019
Reviewed-on: http://codereview.qt.nokia.com/3988
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Lars Knoll [Wed, 31 Aug 2011 12:03:16 +0000 (14:03 +0200)]
Merge remote-tracking branch 'origin/master' into refactor
Conflicts:
src/declarative/declarative.pro
Change-Id: I9c6d8447e1254c6acd32fa0775ff6a79d0d66acd
Alan Alpert [Wed, 31 Aug 2011 07:53:38 +0000 (17:53 +1000)]
Add #version 120 in more places.
Desktop GL implementations don't seem bothered, but not all the ES 2
ones could handle it.
Change-Id: I93af18be342d8d418067a54769d69efc87442886
Reviewed-on: http://codereview.qt.nokia.com/3916
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Alan Alpert [Tue, 30 Aug 2011 02:58:45 +0000 (12:58 +1000)]
Rename PointAttractor x,y to pointX,pointY
Avoid hiding the Item properties, which still have an effect.
Change-Id: I2449c376fe0f2c769792e4bb7b23899672cce5e1
Reviewed-on: http://codereview.qt.nokia.com/3837
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Chris Adams [Wed, 17 Aug 2011 07:46:54 +0000 (17:46 +1000)]
Allow initial property values to be defined with QSGLoader
This commit adds an "active" property to QSGLoader, which can be
used to delay instantiation of the item until the user wishes to
activate the loader. The property is true by default in order to
maintain compatibility with previous behaviour.
The commit also adds a "setSource(v8object)" function to QSGLoader,
which behaves identically to setSource() property mutator except that
it takes a JavaScript object parameter which defines the initial
property values of the item (in a manner similar to that of
QDeclarativeComponent::createObject()).
Task-number: QTBUG-17009
Change-Id: Ifd824b518b60ef7aa3017c384835abb552e65cf1
Reviewed-on: http://codereview.qt.nokia.com/3364
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Alan Alpert [Mon, 29 Aug 2011 08:49:24 +0000 (18:49 +1000)]
setting only colorVariation now works
Wasn't realizing it needed colored shaders for it.
Change-Id: I9d5693d8f8f470d3239339d4457c576f5b40fe3f
Reviewed-on: http://codereview.qt.nokia.com/3723
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Gunnar Sletta [Wed, 31 Aug 2011 06:55:16 +0000 (08:55 +0200)]
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
Martin Jones [Wed, 31 Aug 2011 05:54:54 +0000 (15:54 +1000)]
QtDeclarative does not use libQtSvg
Change-Id: Iac81489c651e5252a7966eaff462d5fd37bf37d3
Reviewed-on: http://codereview.qt.nokia.com/3910
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Michael Brasser [Wed, 31 Aug 2011 04:07:32 +0000 (14:07 +1000)]
Support QT_TRID_NOOP in ListElement.
Task-number: QTBUG-21070
Change-Id: I91f68467ed96c89fe18726372348ebe809099f60
Reviewed-on: http://codereview.qt.nokia.com/3906
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
Alan Alpert [Tue, 30 Aug 2011 04:35:09 +0000 (14:35 +1000)]
Custom Particle now supplies default code
Attributes and a sample function are now prepended to the vertex shader,
allowing many to become simple again.
Change-Id: Ie1fbc864bd0d58647cb67994b96c2cb88db92f10
Reviewed-on: http://codereview.qt.nokia.com/3839
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Chris Adams [Mon, 22 Aug 2011 07:01:04 +0000 (17:01 +1000)]
Add enums support to QObject module APIs
This commit adds support for retrieving enum values from QObject
module APIs.
Task-number: QTBUG-21033
Task-number: QTBUG-21056
Change-Id: Ib2bd107f3f5905e2d2d35f8a20c55045ef9bb322
Reviewed-on: http://codereview.qt.nokia.com/3291
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Caio Marcelo de Oliveira Filho [Mon, 29 Aug 2011 13:11:31 +0000 (10:11 -0300)]
Do not deliver hover events when item is not visible
This patch change the code to also skip invisible items (it was
done for disabled already) when deciding whether or not deliver the
hover events to an item. The rationale here is to follow the same
rule as the other mouse events.
Change-Id: If0fe6d64d1f7cfb8679ce11edda7c02dc3783f9b
Reviewed-on: http://codereview.qt.nokia.com/3861
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Caio Marcelo de Oliveira Filho [Mon, 29 Aug 2011 13:08:45 +0000 (10:08 -0300)]
Fix extra hover enter events being sent by QSGCanvas
This fixes two issues: when one item is entered it is getting the
enter event twice. When we are moving from two items that share the
same parent, the parent is getting enter event -- which shouldn't
happen.
Change-Id: If0fe6d64d1f7cfb8679ce11edda7c02dc3783f9a
Reviewed-on: http://codereview.qt.nokia.com/3860
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Roberto Raggi [Tue, 30 Aug 2011 09:45:36 +0000 (11:45 +0200)]
Fix the directory cache for case insensitive file systems.
Authored-by: Martin Jones
Change-Id: Iebedfa077487f4fa1cab6d159cc4bd1e7b0b7184
Reviewed-on: http://codereview.qt.nokia.com/3870
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Roberto Raggi [Mon, 29 Aug 2011 12:10:12 +0000 (14:10 +0200)]
Fix diagnostic messages.
Change-Id: Id06ff4237129ef5525032c9a2510e4316be52ae2
Reviewed-on: http://codereview.qt.nokia.com/3802
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Roberto Raggi [Mon, 29 Aug 2011 09:52:17 +0000 (11:52 +0200)]
Fix merge errors introduced while rebasing.
Change-Id: I14973b94f404f9e4fe06b192ef177f01e0f5ef01
Reviewed-on: http://codereview.qt.nokia.com/3801
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Roberto Raggi [Thu, 25 Aug 2011 07:21:28 +0000 (09:21 +0200)]
Fix the tst_qdeclarativedebug auto test.
The creation order in QML is not defined.
Change-Id: I4bc3d9e56e32a0c907cdaef9994ae66c3869a4ea
Reviewed-on: http://codereview.qt.nokia.com/3800
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Roberto Raggi [Tue, 23 Aug 2011 16:17:51 +0000 (18:17 +0200)]
Fix the search of QML types.
Stop iterating the multi hash as soon as we find an element with
a different key.
Change-Id: Ie474708229b4040e66b17ceffc5be787856bc905
Reviewed-on: http://codereview.qt.nokia.com/3799
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Roberto Raggi [Tue, 23 Aug 2011 14:55:32 +0000 (16:55 +0200)]
Fix wrong assertion in StringRef::load.
Change-Id: Ib39804b87027bda8cc6694b26e98e18bbc3a159f
Reviewed-on: http://codereview.qt.nokia.com/3798
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Aaron Kennedy [Tue, 23 Aug 2011 01:41:50 +0000 (11:41 +1000)]
Move all QML file parsing into the QDeclarativeScript namespace
Change-Id: I5969686a796cbfb2eeb3729014df7f01e51b0620
Reviewed-on: http://codereview.qt.nokia.com/3797
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Roberto Raggi [Mon, 22 Aug 2011 14:36:04 +0000 (16:36 +0200)]
Collect the source locations of the single and multiline comments.
Change-Id: I7a8f2eec7a45f7a9a1212680f477cc5edd2aaad5
Reviewed-on: http://codereview.qt.nokia.com/3796
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Roberto Raggi [Mon, 22 Aug 2011 13:27:04 +0000 (15:27 +0200)]
Fix the qmldir parser diagnostic messages.
Change-Id: I752d5cf334faa5761007f553caf49e64d0e1f411
Reviewed-on: http://codereview.qt.nokia.com/3795
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Roberto Raggi [Mon, 22 Aug 2011 13:26:10 +0000 (15:26 +0200)]
Update the tst_qdeclarativelanguage::errors() auto test.
Change-Id: I953eecefbf177c7d415b64814cea5ca2611787c3
Reviewed-on: http://codereview.qt.nokia.com/3794
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Roberto Raggi [Mon, 22 Aug 2011 11:46:33 +0000 (13:46 +0200)]
Fix lookup of non scriptable default properties.
Change-Id: I027169a54dc0041212d38aefc99164930c31d2b2
Reviewed-on: http://codereview.qt.nokia.com/3793
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Roberto Raggi [Thu, 18 Aug 2011 14:36:10 +0000 (16:36 +0200)]
Fix property lookup in QDeclarativePropertyCache::create.
Search for the property in the current meta object.
Change-Id: I085f4285298ae952d9c50ee93c47b4009dbe900f
Reviewed-on: http://codereview.qt.nokia.com/3792
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Roberto Raggi [Thu, 18 Aug 2011 14:35:56 +0000 (16:35 +0200)]
Fix compilation.
Change-Id: I75433c3c716b6df33b75d32805fcca822f49a202
Reviewed-on: http://codereview.qt.nokia.com/3791
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Roberto Raggi [Thu, 18 Aug 2011 11:01:05 +0000 (13:01 +0200)]
Fix type of valuetype alias properties.
Update the type and the typename after changing the value of
aliasProperty.
Change-Id: Id0b9d9a66f14524fec6bf23c375ae9af448cbbf3
Reviewed-on: http://codereview.qt.nokia.com/3790
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Roberto Raggi [Thu, 18 Aug 2011 09:39:22 +0000 (11:39 +0200)]
Fix the source location of the T_ELSE token.
Change-Id: I9cb9effad495ae7b20a56c5a8943efbeae95c179
Reviewed-on: http://codereview.qt.nokia.com/3789
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Roberto Raggi [Wed, 17 Aug 2011 12:27:37 +0000 (14:27 +0200)]
Fix parsing of numeric literals.
Store the value in a double.
Change-Id: I17b90d2917a2710d434a92b5f6b297f755156c31
Reviewed-on: http://codereview.qt.nokia.com/3788
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Roberto Raggi [Tue, 16 Aug 2011 14:52:50 +0000 (16:52 +0200)]
Fix the computation of the start token position.
Rewind the buffer pointer only when necessary.
Change-Id: Idd78edc068b1c55d79c5674facd9c55270e536a8
Reviewed-on: http://codereview.qt.nokia.com/3787
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Roberto Raggi [Mon, 15 Aug 2011 13:31:07 +0000 (15:31 +0200)]
Fix initialization order.
Change-Id: I7a7121f658f85c88b3a5260481cf4e05df2dd218
Reviewed-on: http://codereview.qt.nokia.com/3786
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Roberto Raggi [Mon, 25 Jul 2011 15:05:02 +0000 (17:05 +0200)]
Replace the hash tables with simple association lists.
Change-Id: If4fdd14bba6d800699be1bfd9f6b147bb5279a30
Reviewed-on: http://codereview.qt.nokia.com/3785
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Roberto Raggi [Mon, 25 Jul 2011 06:31:21 +0000 (08:31 +0200)]
Merge IR::Module and IR::Function.
V4 compiles one function at time. There is no reson to keep
IR::Module and IR::Function as separate classes.
Change-Id: Ia6bf971d0d499b14847c3ca725f9cdf5c7e3916c
Reviewed-on: http://codereview.qt.nokia.com/3784
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Roberto Raggi [Tue, 9 Aug 2011 13:04:14 +0000 (15:04 +0200)]
Set the name of the default property
Change-Id: I4f69b9e4e33a789215941f8021b8937c8aa2e7c1
Reviewed-on: http://codereview.qt.nokia.com/3783
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Roberto Raggi [Thu, 4 Aug 2011 09:21:19 +0000 (11:21 +0200)]
Fix wrong usage of QStringHash iterators.
The code was creating circular lists of overloads.
Change-Id: I126140dae90fbdf71a53fc8163fe2b56bb069312
Reviewed-on: http://codereview.qt.nokia.com/3782
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Roberto Raggi [Tue, 2 Aug 2011 07:57:01 +0000 (09:57 +0200)]
Recompute the token length after the scan of a regexp.
Change-Id: I9042f261b374bee1a3f9cb8d2dc40e381a66732b
Reviewed-on: http://codereview.qt.nokia.com/3781
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Roberto Raggi [Mon, 1 Aug 2011 16:04:30 +0000 (18:04 +0200)]
Fix visit of list-like AST nodes.
The method finish() of a list-like node will convert the circular
list to a single-list. The right way to iterate is by looking
at the member `next' and by invokign finish().
Change-Id: I85a45b691a6c7089cd1a765871a11a7c60c3cdff
Reviewed-on: http://codereview.qt.nokia.com/3780
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Roberto Raggi [Mon, 1 Aug 2011 16:03:41 +0000 (18:03 +0200)]
Fix possible crash when using the QML lexer without an engine.
Change-Id: Ia7d820cf1a63eaf42041ab78e1f111d31358e4dd
Reviewed-on: http://codereview.qt.nokia.com/3779
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Roberto Raggi [Mon, 1 Aug 2011 15:08:06 +0000 (17:08 +0200)]
Fix initialization of QDeclarativeVMEMetaData::PropertyData for variant properties.
The propertyType member for variant properties needs to be initialized to -1 (at least
according to QDeclarativeVMEMetaObject::metaCall).
Change-Id: I44f226f2bce3732f3a4220fe24617b5cb2292f97
Reviewed-on: http://codereview.qt.nokia.com/3778
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Roberto Raggi [Mon, 1 Aug 2011 14:49:08 +0000 (16:49 +0200)]
Fix comparison.
Change-Id: I58ae5237f3458ee4bada89d1d676645e575d681f
Reviewed-on: http://codereview.qt.nokia.com/3777
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Roberto Raggi [Mon, 1 Aug 2011 14:48:33 +0000 (16:48 +0200)]
Compile.
Change-Id: Id8af2a65e54317a9300289a034c042d59b2c69bd
Reviewed-on: http://codereview.qt.nokia.com/3776
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Roberto Raggi [Thu, 28 Jul 2011 11:20:49 +0000 (13:20 +0200)]
Remove deprecated QChar to ushort conversions.
Change-Id: I2411d2221e70685d1a1518e2f5eb2e693261e00d
Reviewed-on: http://codereview.qt.nokia.com/3775
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Martin Jones [Fri, 22 Jul 2011 07:23:16 +0000 (17:23 +1000)]
Faster check for revisioned properties.
Change-Id: I8122c15d0467019bcd333ca111d2b248c5ca2d91
Reviewed-on: http://codereview.qt.nokia.com/3774
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Aaron Kennedy [Fri, 22 Jul 2011 06:18:06 +0000 (16:18 +1000)]
Special case integers and strings in lexer
Reduces the amount of copying for integer numbers and uses a raw
QStringRef for unescaped strings.
Change-Id: I2ad29f4c67be72495e3209081761b9a1bb503f26
Reviewed-on: http://codereview.qt.nokia.com/3773
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Aaron Kennedy [Fri, 22 Jul 2011 04:40:37 +0000 (14:40 +1000)]
Reduce allocations
Change-Id: I230424147ad195239d725359fcd6dc5568f102a7
Reviewed-on: http://codereview.qt.nokia.com/3772
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Martin Jones [Fri, 22 Jul 2011 06:08:51 +0000 (16:08 +1000)]
less toUtf8()
Change-Id: I9c4b599511e755b8f93d8bb8a7cd3732ca380de0
Reviewed-on: http://codereview.qt.nokia.com/3771
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Martin Jones [Fri, 22 Jul 2011 04:52:08 +0000 (14:52 +1000)]
Remove some QString <-> utf8 conversions.
Change-Id: I4478ec805f5b1e05025baafaf7035b8fb57f9854
Reviewed-on: http://codereview.qt.nokia.com/3770
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Aaron Kennedy [Fri, 22 Jul 2011 03:32:47 +0000 (13:32 +1000)]
Optimize default property resolution in compiler
Change-Id: I90b677a190c0c59ba681a7643a9b13cfb938d5a1
Reviewed-on: http://codereview.qt.nokia.com/3769
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Aaron Kennedy [Fri, 22 Jul 2011 01:51:41 +0000 (11:51 +1000)]
Use the cached property data when possible
Change-Id: I6690208b9a4d99e485874c5253d69cb82938c8a6
Reviewed-on: http://codereview.qt.nokia.com/3768
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Aaron Kennedy [Thu, 21 Jul 2011 13:08:53 +0000 (23:08 +1000)]
Introduce QHashField for use in "contains" tests.
Change-Id: I35aadace15b71b44c1b9e30a76eadf79fe03afad
Reviewed-on: http://codereview.qt.nokia.com/3767
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Aaron Kennedy [Thu, 21 Jul 2011 07:38:30 +0000 (17:38 +1000)]
Use QFieldList to manage dynamic properties, signals and slots
Change-Id: I27282a035a631dde30ee97412d3968ab525b2502
Reviewed-on: http://codereview.qt.nokia.com/3766
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Aaron Kennedy [Thu, 21 Jul 2011 10:01:07 +0000 (20:01 +1000)]
Calculate the hash inside QHashedString
This avoids calling into V8 to calculate the hash. This improves
performance and removes the dependency on V8.
Change-Id: I8ccb405cba15c7eda51a1d56652784164789de7f
Reviewed-on: http://codereview.qt.nokia.com/3765
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Aaron Kennedy [Thu, 21 Jul 2011 04:20:05 +0000 (14:20 +1000)]
Use strings more conservatively
Also adds the ability to efficiently estimate the length of, and
write out to, UTF8 from QHashedStringRef.
Change-Id: I8b6226ba41d855246ddf7d6268f8045c92ae219e
Reviewed-on: http://codereview.qt.nokia.com/3764
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Aaron Kennedy [Wed, 20 Jul 2011 07:47:57 +0000 (17:47 +1000)]
Add QFastMetaBuilder
This is a faster, but less convenient, version of QMetaObjectBuilder.
The aim is to reduce allocations made during building the meta object
by doing it in two passes - first you reserve all the strings needed
and then you provide their data.
Change-Id: Id9caf9c9c6c2ab6a5219e5cea9363463a4ebf822
Reviewed-on: http://codereview.qt.nokia.com/3763
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Martin Jones [Fri, 22 Jul 2011 00:40:01 +0000 (10:40 +1000)]
Inline a couple of often used methods.
Change-Id: I6fdcebd45835e7700fc470790a259e256fa68066
Reviewed-on: http://codereview.qt.nokia.com/3762
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Roberto Raggi [Thu, 21 Jul 2011 13:09:15 +0000 (15:09 +0200)]
Compile
Change-Id: Id7a5520d0e344b708aabacd0b0aefa705b47b197
Reviewed-on: http://codereview.qt.nokia.com/3761
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Roberto Raggi [Thu, 21 Jul 2011 12:47:26 +0000 (14:47 +0200)]
Speedup the V4 code generation.
Skip discarded code and use QVarLengthArray instead of
QByteArray to store the bytecode.
Change-Id: I4c574e7a817595bc8942ed9a927e79339a2d7b40
Reviewed-on: http://codereview.qt.nokia.com/3760
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Roberto Raggi [Wed, 20 Jul 2011 10:51:12 +0000 (12:51 +0200)]
Use QDeclarativePool to allocate the V4 instructions.
Change-Id: Ib4a9748bf81392a901c8ae94a8746f2e52f7284e
Reviewed-on: http://codereview.qt.nokia.com/3759
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Roberto Raggi [Tue, 19 Jul 2011 13:12:40 +0000 (15:12 +0200)]
Change the V4 IR so it can be stored in a memory pool.
That is, remove members with a non-trivial destructor from IR::Stmt
and IR::Expr (that's because we don't destroy the objects
allocated in the pool).
Added the method MemoryPool::reset() so we can clear the pool
without disposing the allocated memory.
Change-Id: I126332be387c016578c086db8b3aa8098b2507f6
Reviewed-on: http://codereview.qt.nokia.com/3758
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Roberto Raggi [Tue, 19 Jul 2011 09:16:33 +0000 (11:16 +0200)]
Removed QDeclarativeJS::NodePool
Change-Id: I69d39ef005900803f6c620ea8f1ca00d054dc8d2
Reviewed-on: http://codereview.qt.nokia.com/3757
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Martin Jones [Thu, 21 Jul 2011 09:05:45 +0000 (19:05 +1000)]
Some lexer improvement, mostly by avoiding QChar::isWhatever()
Change-Id: I330a45a2f611a594d9b0e9bb24ebef028654a8d8
Reviewed-on: http://codereview.qt.nokia.com/3756
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Roberto Raggi [Wed, 20 Jul 2011 13:08:05 +0000 (15:08 +0200)]
Improved parsing of numeric literals
Change-Id: Id02b5b0b0ab590b7ea5d20098472459e1fd986a6
Reviewed-on: http://codereview.qt.nokia.com/3755
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>