Martin Jones [Tue, 13 Dec 2011 02:37:10 +0000 (12:37 +1000)]
Support <strong> in styled text.
Task-number: QTBUG-23105
Change-Id: I15968c43fd0797b94584f110c6aeca06eca832b7
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Martin Jones [Thu, 8 Dec 2011 00:36:44 +0000 (10:36 +1000)]
Add basic custom easing curve docs and test
Change-Id: Id38434cb71417276635b501d13d0145759de9864
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Pekka Vuorela [Wed, 7 Dec 2011 13:41:45 +0000 (15:41 +0200)]
QtQuick TextEdit to set view property to QTextController
Controller wants to know on some cases where it's attached to.
Change-Id: I48df57ea1233a307f4d7424f0f944755604e3a6e
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Simon Hausmann [Mon, 12 Dec 2011 14:32:17 +0000 (15:32 +0100)]
V8: Minor cleanup
Moved context creation into the QV8Engine constructor body. That will make
it easier to execute other initialization stuff in the future, such as
per-thread isolate creation.
Change-Id: Id4aef76d3664a3810143907d2201203b18745a47
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Gunnar Sletta [Mon, 12 Dec 2011 07:56:14 +0000 (08:56 +0100)]
Initialize variable
Change-Id: Ie88f21c4e4c53a023f03f906d2fae7540fbc668d
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Friedemann Kleint [Mon, 12 Dec 2011 10:57:47 +0000 (11:57 +0100)]
QtQuick: Fix compiler warnings.
Mostly introduced by
fdd14a1a10a0a2f42015b30071771bd95215cc1a.
Change-Id: Ief4c33412ef80923de2f91e62bb89c18267a14f3
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Andrew den Exter [Thu, 10 Nov 2011 04:19:32 +0000 (14:19 +1000)]
Create a copy of QLineControl in the QtDeclarative library.
First half of a move of QLineControl from qtbase to qtdeclarative, some
time in the future QLineControl will be deleted from qtbase to finish
the move.
Task-number: QTBUG-22627
Change-Id: I0c3449f57f1a3296a0ff52f2b9a1a78041ae28b2
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Gunnar Sletta [Mon, 12 Dec 2011 06:18:03 +0000 (07:18 +0100)]
Link against widgets only when available
Change-Id: Id7c474fe48bfa99d765267c0e3be1cbf80597548
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Andrew den Exter [Mon, 12 Dec 2011 04:50:01 +0000 (14:50 +1000)]
Fix TextInput not reacting to text color change.
Trigger a relayout with the new color when the color property is
changed.
Task-number: QTBUG-22402
Change-Id: I2dc190e097e878ac498fd04c2800a6e11947527c
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Andrew den Exter [Mon, 12 Dec 2011 02:46:48 +0000 (12:46 +1000)]
Fix test failures in QtQuick 1 TextEdit and TextInput.
Port various fixes for incompatibilites from the QtQuick 2 item tests.
Task-number: QTBUG-21017
Change-Id: I0234fa2623c57138a132558ff4f48602675c3784
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Andrew den Exter [Fri, 9 Dec 2011 06:30:46 +0000 (16:30 +1000)]
Size TextInput cursor correctly.
Use the cursorRectangle property to size and position the TextNode's
cursor rather than recalculating the rectangle in an incompatible way.
Task-number: QTBUG-22386
Change-Id: I8ee02b590796b0304683b9b246aba1e59c1fd6a5
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Andrew den Exter [Thu, 8 Dec 2011 07:52:35 +0000 (17:52 +1000)]
Fix package items not being destroyed when a package is destroyed.
The views parent the delegate items to themselves on creation, before
we delete the package we need to reparent them back to it or they'll
persist indefinately.
Change-Id: I01a36fadb2b0ff1035de46ec2b84a54d73c49bcf
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Mikko Harju [Thu, 8 Dec 2011 11:24:12 +0000 (13:24 +0200)]
QmlProfiler: stream snapshots to reduce memory footprint
Taking a V8 heap snapshot with QV8ProfilerService created multiple
copies of the snapshot data, causing overhead of several megabytes.
This patch changes the snapshot protocol to stream the contents over
the debugger connection.
Change-Id: I90054210233d52dd02aa838201f9b024d578fcea
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Aaron Kennedy [Fri, 9 Dec 2011 18:00:43 +0000 (18:00 +0000)]
Don't access QDeclarativeProperty from bindings as often
Soon QDeclarativeBinding will store the property internally in its
constituent parts and construct the QDeclarativeProperty only when
it is requested.
Change-Id: Id2d7573ffd49aac783737ea6d20aac4e157a9600
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Laszlo Agocs [Thu, 8 Dec 2011 10:46:47 +0000 (12:46 +0200)]
Set target and device for touch events.
The QWidget dependency is being removed from QTouchEvent and therefore
widget() will be removed. There will be QObject *target() instead.
deviceType() has been deprecated and is replaced by QTouchDevice
*device().
Change-Id: Ic07b2c620fbfc1ae2e5eff85c8fc7269c7d5e2a8
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
Caroline Chao [Tue, 29 Nov 2011 09:48:21 +0000 (10:48 +0100)]
Integrate testcocoon support into QtQuickTest.
Add support to install and save coverage data when a test is run
using quick_test_main.
Change-Id: I39ddd678d748979c335139b3f8bda43b3d05720d
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Kent Hansen [Wed, 12 Oct 2011 12:27:57 +0000 (14:27 +0200)]
Get rid of QDeclarativeMetaType::{canCopy,copy}
Now that we have QMetaType::construct() that does placement new
construction, we can use that to copy the value.
We need to destruct the (default-constructed) existing value first,
but for primitive types that's a no-op, and for Qt's types it's
cheap since they use lazy initialization or "shared null".
Change-Id: Idadee04b1d5b590be7fec50fb0396fd277bee973
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Pekka Vuorela [Fri, 9 Dec 2011 09:40:27 +0000 (11:40 +0200)]
Remove dead private method from TextEdit implementations
Change-Id: I6c9a7c71607167b326dc45a35d97bcaf25a9d1b9
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Christian Kamm [Thu, 8 Dec 2011 08:52:01 +0000 (09:52 +0100)]
qmlplugindump: Don't depend on qtquick1 and widgets.
Change-Id: I38baaf2d8d02c3f35d2dece9fc580c6e1fee872d
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Andrew den Exter [Thu, 10 Nov 2011 04:58:17 +0000 (14:58 +1000)]
Create a copy of QTextControl in the QtDeclarative library.
First half of a move of QTextControl from qtbase to qtdeclarative, some
time in the future QTextControl will be deleted from qtbase to finish
the move.
Task-number: QTBUG-22627
Change-Id: I72da2c71ab5b090e2a0a15219b81e522e97c541b
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Alan Alpert [Sun, 4 Dec 2011 23:35:33 +0000 (09:35 +1000)]
Add Screen attached object
Use this to get details of the screen such as size and current
orientation.
As well as adding its own example, this commit updates Calculator to
use Screen instead of Runtime for orientation.
Change-Id: I1b73d2ee22a92b1dee827de1bd893eebec9f5817
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Andrew den Exter [Fri, 9 Dec 2011 06:07:37 +0000 (16:07 +1000)]
Fix tests broken by a change in the signals emitted by AbstractItemModel
QAbstractItemModel used to emit both layoutChanged() and rowsMoved()
when items were moved. The VisualDataModel test expected both signals
but was only interested in the move, and the grid view test had a bug
in its test model that didn't was hidden by the change signal being
emitted and causing bindings to be reevaluated.
Change-Id: Id5d1b5768717f4a82f6eb4710ff3b4429529193e
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Christian Kamm [Thu, 8 Dec 2011 13:15:58 +0000 (14:15 +0100)]
qmlplugindump: Fix dumping of extended QGraphicsWidget.
Change-Id: Id574b4ee98f7d985ef06619956b2c02cac68b553
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Gunnar Sletta [Wed, 7 Dec 2011 09:16:20 +0000 (10:16 +0100)]
Implemented multiple windows and GL context sharing
What was traditionally the QQuickRenderLoop which was used
to support one QQuickCanvas instance has now grown to support
multiple QQuickCanvas instances and is now called
QQuickWindowManager, of which there are two implementations.
QQuickRenderThreadSingleContextWindowManager:
One QSGContext and one OpenGL context is being used to draw
all the windows and we alternate between which surface the gl
context is bound to. This implementation relies on that
swap does not block, but that the graphics pipeline is
vsynced and will eventually block as the buffer queue is
filled up. This is the behavior we get on Mac OS X and
Wayland. The benefit of this implementation is that we have
vsync'ed animations, and the synchronizaiton between GUI and
render thread is simple. (well, simple relative to the
alternative, that is).
QQuickTrivialWindowManager:
One QSGContext and one OpenGL context is being used on the GUI
thread. Animations are ticked from a timer. Performance of this
implementation will deteriorate if the driver is using blocking
swap.
Task-number: QTBUG-19455
Change-Id: Ib961ac7d71eb49c70a057872b7cac020c4d19f3d
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Chris Adams [Wed, 7 Dec 2011 06:57:34 +0000 (16:57 +1000)]
Update whatsnew doc with JavaScript improvements
Several JavaScript integration improvements were made recently:
- sequence support
- "var" properties
- improved scarce resource support
Change-Id: Id9f47d14c961397d970e306eac2bec5d3e55cab3
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Kai Koehne [Wed, 30 Nov 2011 16:16:42 +0000 (17:16 +0100)]
Debugger: Run js autotests with QML_DISABLE_OPTIMIZER
That's how you'd usually debug your app too.
Change-Id: I5acbf2fea0db3cb8593d690638f90ec849cf316a
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Aaron Kennedy [Wed, 7 Dec 2011 14:20:01 +0000 (14:20 +0000)]
Fix QObject V8 wrapping for extended types
The meta object for extended types must be marked as dynamic, to prevent
their properties from being marked as IsDirect.
Task-number: QTBUG-22997
Change-Id: I825f94f072cb46981706221a1044c9e2feeedcc2
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Alan Alpert [Wed, 7 Dec 2011 03:26:48 +0000 (13:26 +1000)]
Move snippets to separate test in the examples testcase
This test filters out warning messages, so as to not clutter the logs.
Also altered an example so that v8 doesn't spit out a warning message.
Change-Id: I89ab9f1c12bee6cea88e06ce5bf98f2f69a13559
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Friedemann Kleint [Tue, 6 Dec 2011 12:43:06 +0000 (13:43 +0100)]
Fix linking of QtQuick.dll on Windows.
Put class QDeclarativeComponentAttached into a separate header.
When declared as Q_AUTOTEST_EXPORT in
declarative/qml/qdeclarativecomponent_p.h which is included by
quick/qquickloader.cpp, the Q_AUTOTEST_EXPORT is seen as
__declspec(dllexport) and linking fails.
Change-Id: I835197e3af6993cfd9325a432f33c636b9bfd3e6
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Martin Jones [Wed, 7 Dec 2011 01:20:25 +0000 (11:20 +1000)]
Avoid Text layout being triggered unnecessarily
Text was quite often layed out twice during construction due to
geometry changes, and often at run time due to other geometry changes.
This change checks for cases which do not require relayouting and
drops out early. These are easier to detect than trying to have a
single giant if statement covering all the positive combinations.
Change-Id: I2deb2ab52d35b3d02bced698d05fef91c9e2f745
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Andrew den Exter [Mon, 5 Dec 2011 01:36:55 +0000 (11:36 +1000)]
Add support for pixmap cache images to TextEdit.
Re-use the QQuickTextDocumentWithImageResources class from Text to
allow image resources to be loaded from the pixmap cache.
Change-Id: I13170eefe664447b77f2980fb2fe7b4e2f8eb81c
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Andrew den Exter [Mon, 5 Dec 2011 01:32:16 +0000 (11:32 +1000)]
Fix images not displaying on lines with no text.
Update the current line when adding an image if it positioned at the
start of the line.
Change-Id: I7c29f8c3a8d8923030c473446bb6d03bfb524b49
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Andrew den Exter [Mon, 5 Dec 2011 01:29:04 +0000 (11:29 +1000)]
Prevent consecutive images from climbing up a text node.
Vertically position all nodes at the baseline minus their ascent.
Previously the bounding rect of a glyph run was postioned on the base
line and images at the baseline minus the ascent. This meant that
calculated position of an image was correct if it followed text but
if it followed another image it would be positioned above it.
Change-Id: I03f5e0b48f132f010d16c49620fa9463873f9492
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Charles Yin [Wed, 7 Dec 2011 03:04:20 +0000 (13:04 +1000)]
Remove warning messages for canvasitem tests
1) The null image warnings can be safely ignored as the images are
expected to be null
2) Check the isLoading() before calling QDeclarativePixmap::connectFinished()
Change-Id: I58339f40495fb62c73b217aca35cdd7effd8c917
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Martin Jones [Wed, 7 Dec 2011 01:35:57 +0000 (11:35 +1000)]
Fix some warnings.
Change-Id: Iba2ec5640d02cb265ea23e4f9c5303a2da34dffd
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Martin Jones [Tue, 6 Dec 2011 23:56:45 +0000 (09:56 +1000)]
Remove insignificant_test from GridView tests.
This has not failed in a long time.
Change-Id: I58ca0a6941662040a941ae7264aa9e4f9e3cf359
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Kai Koehne [Tue, 6 Dec 2011 14:16:55 +0000 (15:16 +0100)]
Debugger: Fix compilation warning in autotest
Change-Id: I84c058a3cc8808d2da94ae6cb63815cd436bb8b8
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Aaron Kennedy [Thu, 1 Dec 2011 14:48:20 +0000 (14:48 +0000)]
Copy JS tests from QtScript module
This allows qtdeclarative to build and run its tests without
relying on the QtScript module
Change-Id: I469254fbfec159ab2221140c588a1b3ec1c0a2d0
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Roberto Raggi [Tue, 6 Dec 2011 13:09:22 +0000 (14:09 +0100)]
Improve parsing of escape characters and regexp literals.
That is, in QML/JS you can escape characters in identifiers, e.g.
var c\u0061se = 25
declares a variable called `case' with value 25. In such cases
qmlmin needs to preserve the escape sequence in the declaration.
Also, fix possible errors when pasting keywords after regexp literals.
The minifier needs to preserve the whitespace character after the
regexp delimiter, e.g.
/x/instanceof blah
without the white space after the regexp, the `i' of `instanceof'
is parsed as a regexp flag.
Change-Id: I5f426ac62949e34d092d4fdb0a41243de8ff2236
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Roberto Raggi [Tue, 6 Dec 2011 11:05:55 +0000 (12:05 +0100)]
Fix the QML/JS parser to accept empty Javascript files.
Change-Id: I0c5dfdc76489e6d1ec5608dea625cb0d109288e2
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Gunnar Sletta [Tue, 6 Dec 2011 07:06:03 +0000 (08:06 +0100)]
Cleaned up the qmlscene code a bit
Change-Id: I2aed4786e5426a7f05acced39ef849c03f1ab935
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Friedemann Kleint [Mon, 5 Dec 2011 12:38:19 +0000 (13:38 +0100)]
test/debugutils: Add include guard.
Change-Id: I3d65569851169ce4aa350b0268ec5ca1c516613e
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Roberto Raggi [Fri, 2 Dec 2011 15:53:32 +0000 (16:53 +0100)]
Introduce methods to get the source location of the AST nodes.
Also removed deprecate AST nodes.
Change-Id: I9221e81b15b18530bb2ab8b09da2482df543bace
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Jason McDonald [Tue, 6 Dec 2011 00:13:07 +0000 (10:13 +1000)]
Remove TESTED_CLASS/TESTED_FILES comments from tests.
These comments were mostly empty or inaccurate. Appropriate naming of
tests and appropriate placement of tests within the directory tree
provide more reliable indicators of what is being tested.
Change-Id: If69bdb39fd162d167cb948ddcbb73503b414e791
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Martin Jones [Tue, 6 Dec 2011 02:29:09 +0000 (12:29 +1000)]
Ignore expected warnings in Item and PathView tests
Change-Id: I05ebebbfe7f6b107068e9feaf66c03fd3ae71237
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Alan Alpert [Tue, 6 Dec 2011 01:21:49 +0000 (11:21 +1000)]
Decrease debug output of modelview examples.
Change-Id: Idc7fd22f05eee7943c3b824a460897f13dc0408b
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Alan Alpert [Tue, 6 Dec 2011 01:24:32 +0000 (11:24 +1000)]
Use qt_Opacity in shaders
Change-Id: Ie9da3e980ece4bcb71c0886d58bc46335f5289a6
Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
Martin Jones [Mon, 5 Dec 2011 00:59:29 +0000 (10:59 +1000)]
Add tests for snapOneItem/snapOneRow snapMode
Change-Id: Ia7e8fe6a7da48d8f67914d90377c6fad32ecb415
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Alan Alpert [Tue, 6 Dec 2011 01:09:53 +0000 (11:09 +1000)]
Restrict particles to eight attributes max
Change-Id: Ie42621ffc3601d730407e5d6eb88db5d93b415ff
Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
Alan Alpert [Mon, 5 Dec 2011 06:55:14 +0000 (16:55 +1000)]
Fix image path
Plasma Patrol wasn't finding a text mask.
Change-Id: I10934d3cecd076df885ba68833d7654f4b3978d0
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Chris Adams [Mon, 10 Oct 2011 02:11:21 +0000 (12:11 +1000)]
Ensure that scarce resources work with var properties
Now that we have a new property type which stores JavaScript handles,
we need to ensure that scarce resources can be used with them.
Task-number: QMLNG-18
Task-number: QTBUG-21843
Change-Id: I4a920ae39e7d33cf5e33362e5e0ee21c74cb35e3
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Chris Adams [Thu, 1 Dec 2011 06:07:59 +0000 (16:07 +1000)]
Document function limitation of var properties
Functions cannot be assigned to var properties due to the fact that
such an assignment signifies a binding assignment. This limitation
needs to be documented. One workaround is to assign an array which
contains a function element to a var property, and this commit also
adds a unit test to ensure this works.
Change-Id: I02363b88233282106ac6d26f14df1988155057b9
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Chris Adams [Mon, 5 Dec 2011 03:16:54 +0000 (13:16 +1000)]
Disable tst_qdeclarativepixmapcache::dataLeak() by default
This test produces spurious output in the expected case and therefore
needs to be suppressed by default.
Change-Id: Ib309f96c0291180f2011451605eea7f9cea5744b
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Aaron Kennedy [Mon, 5 Dec 2011 15:19:09 +0000 (15:19 +0000)]
Don't eval signal handler closure until signal is emitted
Change-Id: Ic3bd6ed53330b19567fa0bf34b8e4618e3f68ba5
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Roberto Raggi [Mon, 5 Dec 2011 13:42:09 +0000 (14:42 +0100)]
Adjust the source location of the last accepted token.
This is necessary to get automatic semicolons inserted at the correct
location.
Change-Id: Ie3f806ed20704310cd6155f2dac6d0388a4a9f78
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Aaron Kennedy [Mon, 5 Dec 2011 14:10:59 +0000 (14:10 +0000)]
Fix crash when QtQuick 2.0 wasn't imported
The QML compiler still tried to resolve the implicit "Component" element
within the QtQuick 2.0 namespace.
Task-number: QTBUG-23017
Change-Id: I62ae962f58787910a76f76c872daa08874b5df56
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Aaron Kennedy [Mon, 28 Nov 2011 16:04:33 +0000 (16:04 +0000)]
Introduce more generic fast property handling
Also reduce the number of direct calls to qt_metacall().
Change-Id: I04cd6e516a3e61058548309a19fe0b830f15c93f
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Gunnar Sletta [Mon, 5 Dec 2011 09:24:28 +0000 (10:24 +0100)]
Use the texture atlas height to compute y coordinates
Change-Id: Ib0266ef6a46f58fe2c2892b8be297efe2f85aa98
Reviewed-by: aavit <qt_aavit@ovi.com>
Andrew den Exter [Mon, 5 Dec 2011 05:27:00 +0000 (15:27 +1000)]
Don't attempt to destroy a null persisted item.
Persisted items are still only constructed on demand so we can't
assume the object is non null.
Change-Id: I1ce9563eb3b9fb1ae611e8afcf9c8c74f0563aec
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Andrew den Exter [Fri, 2 Dec 2011 05:56:45 +0000 (15:56 +1000)]
Fix QQuickVisualDataModel test failure.
When connecting the source object's notify signals to the proxy object's
the objectName property wasn't being skipped, this didn't matter much
before because the object name property didn't have a notify signal
and so was skipped anyway. Adding a notify signal resulted in all the
signal connections being off by one.
The object list proxy meta-object also shouldn't assume that QObject
has only and only ever will have one property.
Change-Id: I238e05153446cbfdceea643963e3a26f665e41a1
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Aaron McCarthy [Fri, 2 Dec 2011 03:35:07 +0000 (13:35 +1000)]
Fix loading imports from Qt resource.
Loading an import from a Qt resource fails because the url of the module
was erroneously being converted to a file:// url. This results in a url
that looks like "file://:/MyModule". Fixed by adding a check to see if
the module path is a resource path (starts with :) and if so constructs
a qrc:// url instead.
Change-Id: I41a24a93d085baaf68d58c4e991d6ba2aff5e7ff
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Martin Jones [Mon, 5 Dec 2011 05:40:31 +0000 (15:40 +1000)]
Document headerItem and footerItem of ListView and GridView.
Change-Id: Icfa899bc8c8c7e40f79988700a94ee8480e42bd6
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Alan Alpert [Sun, 4 Dec 2011 23:22:48 +0000 (09:22 +1000)]
Make particle shader more portable
Change-Id: I699712f94ecb4d510d02919c1dcf69828c42a316
Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Andrew den Exter [Mon, 5 Dec 2011 01:01:15 +0000 (11:01 +1000)]
Fix test failures due to invalid font metrics.
Don't use QFontMetrics to determine expected text dimensions or
cursor positions in TextInput and TextEdit tests. Instead Layout the
text with the same options as used by the item so the only error should
be due to error.
Task-number: QTBUG-21689
Change-Id: I7ba008d92f1ebb14c37ae7df06fdb11465c3225d
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Alan Alpert [Sun, 4 Dec 2011 22:23:22 +0000 (08:23 +1000)]
Revert "sync to an earlier qtbase"
This reverts commit
3a034c19c89c9528df8b7e2ee9e9a23bd7684958.
The conflicting change in qtbase was also reverted, so there should no
longer be a need for the earlier qtbase.
Change-Id: I91303410378e1a6e0f86286dd402810b24b6d4ec
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Alan Alpert [Sun, 4 Dec 2011 23:23:34 +0000 (09:23 +1000)]
Don't delay mirroring until polish
Mirroring is not a good candidate for delays because it isn't always
able to trigger a new polish.
Task-number: QTBUG-22968
Change-Id: I1243aadea1202936255a42f77dea2b7571c52cab
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Alan Alpert [Sun, 4 Dec 2011 23:22:09 +0000 (09:22 +1000)]
Add tutorials to examples autotest.
Change-Id: I339446212e3ac9608eada0601e83d86789d33e0b
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Michael Brasser [Thu, 1 Dec 2011 03:01:36 +0000 (13:01 +1000)]
Test fixes for OS X.
Change-Id: Idee212db1ee267d44463886de6a7918404ba549d
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Alan Alpert [Thu, 1 Dec 2011 07:27:45 +0000 (17:27 +1000)]
Examples has grown to more than just declarative.
The examples.pro file should no longer be skipped.
Change-Id: I2af08eec7fa69b996d1b6f237f40259c89f326f6
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Friedemann Kleint [Fri, 2 Dec 2011 16:05:50 +0000 (17:05 +0100)]
QtQuick: Fix linkage of QQuickFlickable.
Change-Id: I0cfc78ed9af01bbd3063cb17a9a380ca8714372d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Kent Hansen [Wed, 23 Nov 2011 14:14:07 +0000 (15:14 +0100)]
Say hello to QtQuick module
This change moves the QtQuick 2 types and C++ API (including
SceneGraph) to a new module (AKA library), QtQuick.
99% of this change is moving files from src/declarative to
src/quick, and from tests/auto/declarative to
tests/auto/qtquick2.
The loading of QtQuick 2 ("import QtQuick 2.0") is now delegated to
a plugin, src/imports/qtquick2, just like it's done for QtQuick 1.
All tools, examples, and tests that use QtQuick C++ API have gotten
"QT += quick" or "QT += quick-private" added to their .pro file.
A few additional internal QtDeclarative classes had to be exported
(via Q_DECLARATIVE_PRIVATE_EXPORT) since they're needed by the
QtQuick 2 implementation.
The old header locations (e.g. QtDeclarative/qquickitem.h) will
still be supported for some time, but will produce compile-time
warnings. (To avoid the QtQuick implementation using the
compatibility headers (since QtDeclarative's includepath comes
first), a few include statements were modified, e.g. from
"#include <qsgnode.h>" to "#include <QtQuick/qsgnode.h>".)
There's a change in qtbase that automatically adds QtQuick to the
module list if QtDeclarative is used. Together with the compatibility
headers, this should help reduce the migration pain for existing
projects.
In theory, simply getting an existing QtDeclarative-based project
to compile and link shouldn't require any changes for now -- but
porting to the new scheme is of course recommended, and will
eventually become mandatory.
Task-number: QTBUG-22889
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Change-Id: Ia52be9373172ba2f37e7623231ecb060316c96a7
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Christian Kamm [Fri, 2 Dec 2011 08:30:48 +0000 (09:30 +0100)]
qmlplugindump: Fix missing flush for objects that don't fit a line.
The missing flush could result in script bindings appearing after the
closing brace of an object.
Change-Id: If05764619668cc4a86f7364f6cd7feeb0d6f6e32
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
Glenn Watson [Thu, 1 Dec 2011 00:40:44 +0000 (10:40 +1000)]
Add dynamicRoles mode to ListModel for extra flexibility.
ListModel contains a new property called dynamicRoles.
By default this property is disabled, meaning that
the type of a given role cannot be changed dynamically.
However, when this property is set, the type of a
role can change between elements. This allows more
flexibility but comes at a significant performance
cost over the default static role mode.
Change-Id: I478d48c882f51ba2dde37f88e2aac744e919b68b
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Charles Yin [Fri, 2 Dec 2011 00:47:59 +0000 (10:47 +1000)]
Addd expectFail() to qmltestexmaple to avoid failure report from CI.
Change-Id: I35637c9951085d42d216b8eb1eb03ef1206d51d6
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Andrew den Exter [Tue, 29 Nov 2011 05:33:56 +0000 (15:33 +1000)]
Use QWidgetTextControl in the QtQuick1 TextEdit.
QDeclarative1TextEdit and QTextEdit have the same compatbility
requirements so it makes sense they continue sharing the same line
control implementation. This allows the QtQuick 2 TextInput to diverge
without creating a third variation of QTextControl,
Task-number: QTBUG-22627
Change-Id: Id4a8f6a17aeb756c3385cf8fca3de61b8c4be757
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Andrew den Exter [Thu, 10 Nov 2011 03:20:45 +0000 (13:20 +1000)]
Use QWidgetLineControl in the QtQuick1 TextInput.
QDeclarative1TextInput and QLineEdit have the same compatbility
requirements so it makes sense they continue sharing the same line
control implementation. This allows the QtQuick 2 TextInput to diverge
without creating a third variation of QLineControl.
Task-number: QTBUG-22627
Change-Id: Ic06f66f1cb55e78f7129889a4877c3aba5ba72f6
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Gunnar Sletta [Fri, 2 Dec 2011 06:59:44 +0000 (07:59 +0100)]
Remove QSGContext and QSGTexture from QDeclarativePixmapData
In order to cleanly support multiple windows we need to not
have the QSGContext reference in QDeclarativeEngine and we
need to be able to have one copy of the texture for each
QSGContext that is not sharing when we have multiple windows.
This also makes it easier to the release graphical resources from
a running application, which is another feature that we want
to eventually implement.
This patch does remove an adaptation feature which is the
decodeToTexture, which seemed like a good idea at the time
but in hindsight has not been used for anything.
Edit: resolved conflict in qquickimage.cpp
Edit: updated QDeclarativePixmap testcase
Edit: updated QQuickImage testcase
Edit: Rebased on top of QDeclarativePixmapCacheChanges
Change-Id: Ifc61dd8158d3f841437d029b6031a91196145517
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Aaron Kennedy [Thu, 1 Dec 2011 14:34:10 +0000 (14:34 +0000)]
Fix test warnings
If the enums aren't correctly registered, the use of signal spy always
causes a warning.
Change-Id: If7fd0c1765ac33e0c1548701e199e710e2fe3b30
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Martin Jones [Fri, 2 Dec 2011 00:23:08 +0000 (10:23 +1000)]
Fix pixmap leak in Text with embedded images.
Insert into hash with same key we use to lookup :-/
Change-Id: I1d70916fab578c8280a11b3a03fb7cfd6ad4d594
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Martin Jones [Thu, 1 Dec 2011 23:36:21 +0000 (09:36 +1000)]
Fix listview test warning
Change-Id: I24cead9eb52f9e1cca39ffe5d6e32a57453186d6
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Martin Jones [Thu, 1 Dec 2011 22:58:49 +0000 (08:58 +1000)]
Fix gridview test warning.
Also removed unnecessary QtQuick 1.1 test.
Change-Id: I6f048d22fbbaa817358da7bb5d85187fabc119ff
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Martin Jones [Thu, 1 Dec 2011 06:55:51 +0000 (16:55 +1000)]
Don't use idle priority for background threads.
Using idle priority for image loading meant that images could
remain unloaded for a looong time. Change to LowestPriority.
Change-Id: Ieb89e94f5e37b9fe795a76368e4d23edb40978f7
Reviewed-by: Bjørn Erik Nilsen <bjorn.nilsen@nokia.com>
Alan Alpert [Fri, 2 Dec 2011 03:52:44 +0000 (13:52 +1000)]
sync to an earlier qtbase
change
ba635d7e74472f3a54c0c4686966af46d9035c6f breaks qtdeclarative CI.
Using an earlier qtbase while the matter is investigated.
Task-Number: QTBUG-22985
Change-Id: I2d1c5f03f48d4383fd84a42612314bea0bdc675d
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Aaron Kennedy [Thu, 1 Dec 2011 17:14:19 +0000 (17:14 +0000)]
Ignore expected warning
Change-Id: I6e90537461fa4939c724b3031f3b3b5f04343d8e
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Aaron Kennedy [Fri, 14 Oct 2011 07:41:29 +0000 (17:41 +1000)]
Autotest
Change-Id: I796ef5e0d70a7e3a95858468583c4ecb447991ee
Task-number: QTBUG-21864
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Aaron Kennedy [Thu, 1 Dec 2011 14:08:57 +0000 (14:08 +0000)]
Ignore expected warning message
Change-Id: I80d2b6e082f6e648ee888820903bc81a21c0d302
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Aaron Kennedy [Wed, 30 Nov 2011 17:54:03 +0000 (17:54 +0000)]
Improve value type read performance
On x86, this gives ~3x improvement in property read time.
Change-Id: I8f75e9bb7450bc56ca42f8258c3a5641bc9c18d3
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Kai Koehne [Wed, 30 Nov 2011 15:27:01 +0000 (16:27 +0100)]
Take multi-line expressions into account when rewriting expressions
Take into account the newlines expressions might have when
combining multiple expressions into one.
Change-Id: Ib7170f624b6b6dee522e2d376a513ac08a8baa46
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Aaron Kennedy [Thu, 1 Dec 2011 12:30:17 +0000 (12:30 +0000)]
Remove debugging
Change-Id: Ib672ae608446acb1ddf7df8354fb7ae051b9e834
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Aaron Kennedy [Thu, 1 Dec 2011 15:03:07 +0000 (15:03 +0000)]
Fix test warnings
Change-Id: I35428417ef6c21166ac991c28a540fa4e8ec19fb
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Aaron Kennedy [Thu, 1 Dec 2011 14:55:43 +0000 (14:55 +0000)]
Ignore test warning
Change-Id: I030a8be90cc95105ca016b74ad017c46ba7ffe17
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Kai Koehne [Thu, 1 Dec 2011 14:54:46 +0000 (15:54 +0100)]
Debugger autest: Don't show debugee output for expected failures
Change-Id: Ifd068f8c680dcde7bf9c2e078e13eeee1bcba552
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Aaron Kennedy [Thu, 1 Dec 2011 14:43:01 +0000 (14:43 +0000)]
Delete created objects
This eliminates "leak" warnings that were generated when the test
exited.
Change-Id: I66088f29b88b95662d6ab4e65b5e2a77b415a9f9
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Aaron Kennedy [Thu, 1 Dec 2011 14:03:18 +0000 (14:03 +0000)]
Don't build an app_bundle on OS X
Change-Id: I7d5aa114baaea881a3fe56157e2530d1f89be91c
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Friedemann Kleint [Thu, 1 Dec 2011 13:14:43 +0000 (14:14 +0100)]
Windows: Fix building of XML list model plugin.
Change-Id: Ia070f4b4fd726d201dde7aa43e2c62eacfaff40e
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Aaron Kennedy [Thu, 1 Dec 2011 13:59:47 +0000 (13:59 +0000)]
Delete created objects
This eliminates "leak" warnings that were generated when the test
exited.
Change-Id: Ia186241c05c28a6e5eb7b6b431e084f95f5934be
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Aaron Kennedy [Thu, 1 Dec 2011 11:11:43 +0000 (11:11 +0000)]
Move QDeclarativePropertyValueInterceptor into a private header
This should never have been public.
Change-Id: I77811413c93fdc7767d0921e12284e9a8bc88752
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Aaron Kennedy [Thu, 1 Dec 2011 13:31:32 +0000 (13:31 +0000)]
Remove debugging output
The console.log() is not a significant part of the test, so it can be
removed. The exception will still be thrown if keys is not a function.
Change-Id: Ifaec6e0ed5ecc32ad7b885bff31df493120ed9aa
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Andras Becsi [Tue, 29 Nov 2011 14:51:24 +0000 (15:51 +0100)]
Export QQuickFlickable to make it possible to use it as private API.
Make it possible for the QtWebKit WebView to use Flickable as a base
class by depending on QtDeclarative private API for now.
Change-Id: Ia7b8a4aa1c59b9a089b4beecb0d9af5cf8883f07
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Aaron Kennedy [Thu, 1 Dec 2011 13:39:59 +0000 (13:39 +0000)]
Remove debugging
Change-Id: I64cc9fb96f5f456cb9b18ba5706a79bf7c6cde16
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>