Alan Alpert [Sun, 19 Feb 2012 23:35:02 +0000 (09:35 +1000)]
Fix Screen::AngleBetween
Enum values in invokables don't worry currently, so use ints.
Also AngleBetween is no longer static, so it has to be initialized
before the function can be used.
Change-Id: I4a6748fef6920bab6f08f22ce68911c3af6ce821
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Kim Motoyoshi Kalland [Tue, 14 Feb 2012 11:31:11 +0000 (12:31 +0100)]
Added QSGRenderNode class.
Change-Id: I8c903cae490158b864af60f53c10c10f2faea7c0
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Aaron Kennedy [Tue, 14 Feb 2012 10:47:03 +0000 (10:47 +0000)]
Use Utf8 for javascript source code
This saves a surprising amount of memory.
Change-Id: I16f7bde8d11fe11703d4e441060fd52e9632248c
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Aaron Kennedy [Mon, 13 Feb 2012 16:14:53 +0000 (16:14 +0000)]
Use the existing endpoint object to connect alias notify signals
Change-Id: I891ea5e3854a4fc92ba59e98417ad72774bd7adb
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Aaron Kennedy [Tue, 7 Feb 2012 13:33:22 +0000 (13:33 +0000)]
Reduce size of QDeclarativePropertyData
Accessors cannot overload properties and are not available on value
types so can be safely union'd together.
Change-Id: Iae34f8b2935d010ca43365238a7514c0e26953f0
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Michael Brasser [Fri, 17 Feb 2012 04:02:49 +0000 (14:02 +1000)]
Use an enum rather than a string to represent state event types.
Change-Id: Iad230b610f35b1c1faa6ce60615551f293d4745d
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Michael Brasser [Fri, 17 Feb 2012 02:42:29 +0000 (12:42 +1000)]
Improve test coverage for AnchorChanges.
Change-Id: If6d62febed093a07d75a6125a920aac628c35e54
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Michael Brasser [Sun, 19 Feb 2012 23:38:56 +0000 (09:38 +1000)]
Stabilize test.
Change-Id: I5b4c4298653186216e6e093ce3194cfde0cd51b9
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Bea Lam [Fri, 17 Feb 2012 02:38:53 +0000 (12:38 +1000)]
Take QDeclarativeTransition::enabled() into account
Don't run transitions if enabled() is false
Change-Id: I1df5479f8415b12837df8d54aa3902e072c73037
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Michael Brasser [Wed, 8 Feb 2012 03:17:56 +0000 (13:17 +1000)]
Add velocity data to TouchPoint
Change-Id: I0555b3ad41e8c08563188e1ba9190e54d4bb3784
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Martin Jones [Fri, 17 Feb 2012 00:11:43 +0000 (10:11 +1000)]
Make QLocale::uiLanguages() available in Qt.locale() object
Available as uiLanguages property returning an array of strings.
Change-Id: Ic698bbaff2eb0f9f6720ae06952c12a987298964
Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
Jan-Arve Saether [Thu, 16 Feb 2012 12:07:24 +0000 (13:07 +0100)]
Remove QAccessibleInterface::navigate()
Hierarchical navigation has been moved to parent() and child(),
relationships have been moved to relations()
Change-Id: I4313eb3a6ed8b4812a347bb27b4d62f4f62ee9d5
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Pekka Vuorela [Wed, 15 Feb 2012 12:30:44 +0000 (14:30 +0200)]
Have input method hints on only classes using them
Removed inputMethodHints setter and getter from QQuickItem.
No need to consume memory for input method hints on every item when
only QQuickTextInput and QQuickTextEdit actually use them.
Additionally introduced change signals on the editor hint properties.
Change-Id: Ice380d4f4dd47fdde73d2468f4a44a7d1540ad45
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Andrew den Exter [Wed, 15 Feb 2012 01:40:59 +0000 (11:40 +1000)]
Avoid an unnecessary layout when eliding text.
Query the elided text from the initial layout rather than doing a
second layout of the line to be elided.
Change-Id: I399f99a11046013c0c51add2e2f2dd14b959831a
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Bea Lam [Thu, 16 Feb 2012 04:52:39 +0000 (14:52 +1000)]
Check pending changes before they are reset, not after
Change-Id: Ibe295741ee323522b98e4fd834f61053f9053e1f
Reviewed-by: Martin Jones
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Yann Bodson [Thu, 16 Feb 2012 03:45:40 +0000 (13:45 +1000)]
Provide visual debugging for MouseArea and TouchArea
Display MouseAreas and TouchAreas as semi transparent rectangles
when the environment variable QML_VISUAL_TOUCH_DEBUGGING is set.
Task-number: QTBUG-24283
Change-Id: Iec8482a79ed1d4b802c29a5f7104af4e0a6eab7d
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Aaron Kennedy [Tue, 7 Feb 2012 13:29:52 +0000 (13:29 +0000)]
Reduce the memory used by QStringHash
This change reduces the memory consumed by individual QStringHashNodes,
and adds support for "linking" one hash to another that allows us to
avoid copying all the nodes.
Change-Id: Ib5bd151d8ec610a020fd125f46a4e218d959529b
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Friedemann Kleint [Wed, 15 Feb 2012 09:23:33 +0000 (10:23 +0100)]
QtDeclarative/Quick: Fix warnings.
Change-Id: I71bd638fcc41356e0b76df27ec76ad3ed5ef90d9
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Michael Brasser [Wed, 15 Feb 2012 06:27:36 +0000 (16:27 +1000)]
Ensure visibility changes are communicated through itemChange.
Also added MouseArea test that depends on this functionality.
Change-Id: I1c303504ffd63d6b9dbdf95ab63e8426dc09c02d
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Michael Brasser [Wed, 15 Feb 2012 00:27:44 +0000 (10:27 +1000)]
Set the type for unary expressions in v4.
Previously unary expressions were being discarded because the type
was not set. Also add tests verifying the results.
Change-Id: Icbb493fbb6f036e59c8a4a1fe232c118312a63a5
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Bea Lam [Thu, 9 Feb 2012 07:59:44 +0000 (17:59 +1000)]
Built-in transition support for ListView & GridView
ListView and GridView can now be assigned transitions to be run when:
- Populating the view (when initially setting the model / resetting)
- Adding items
- Removing items
- Moving items
The ViewTransition attached object can be used from within a transition
declaration to access various information about the items that are
being transitioned.
Task-number: QTBUG-21504
Change-Id: Ie5c75ea511c8b15acc3f06fccf19abe34d3677f9
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Andrew den Exter [Tue, 14 Feb 2012 07:02:55 +0000 (17:02 +1000)]
Fix multi-length string substitution.
Multi-length string eliding was provided by QFontMetrics::elidedText()
which is no longer used for layouts. So we instead have to do the
string substitution ourselves if the text doesn't fit before finally
eliding.
Change-Id: Iab2e54b332390290d656299a5be148f39f78df9d
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Martin Jones [Thu, 16 Feb 2012 03:45:02 +0000 (13:45 +1000)]
Allow binding the size of a Loader to its item.
If the size of the Loader is bound to the item, the item was resized
before the binding was evaluated, resulting in an item height of 0.
This change allows bindings to the item to be evaluated before we
apply the resize logic.
Task-number: QTBUG-22628
Change-Id: I30acdb54214b422a9d4aa4e7e02a0af3674322db
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Michael Brasser [Thu, 16 Feb 2012 04:08:54 +0000 (14:08 +1000)]
Add basic plugin metadata for QtQuick2 import plugin.
This indirectly fixes the qdebugmessageservice autotest,
which was getting confused by the "old plugin" warning.
Also updated the extension plugin interface to use
org.qt-project rather than com.trolltech.
Change-Id: I94fc6cf03d23e606c2e2333b013dd2b698f04623
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Christiaan Janssen [Mon, 13 Feb 2012 13:06:47 +0000 (14:06 +0100)]
QmlProfiler: sending start profiling message
Will be used by the client to show status in the GUI.
When profiling is stopped, data is sent immediately,
therefore no "stop profiling" message.
Change-Id: Idd12069a9707296b87e305e8b3cbf8e324989a3f
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Gunnar Sletta [Wed, 15 Feb 2012 10:32:02 +0000 (11:32 +0100)]
Introduced QQuickCanvas::releaseResources().
This function can be used in certain situations to purge the texture cache
and triggers more lazily to take down the scene graph and GL context
Change-Id: Icd9360ff50fda0e721ba0f1b520cda678e457a35
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Chris Adams [Wed, 8 Feb 2012 05:45:18 +0000 (15:45 +1000)]
Fix warnings in sequence wrapper code
Previously, the sequence wrapper had unsigned int / signed int
comparisons (due to Qt container classes only allowing signed int
indexes (where negative indexes are invalid).
This commit ensures that unsigned indexes are bounds checked
appropriately, and also fixes a warning due to QString construction
from QByteArray. Finally, it updates the documentation for sequences
to clarify the indexing semantics.
Change-Id: I4c6e133bef6e980a9ccb62ff15a70a5d41537ee3
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Michael Brasser [Wed, 15 Feb 2012 03:20:56 +0000 (13:20 +1000)]
Improve test coverage for QQuickItem.
Change-Id: I1a49fd44ba85e0fa87a76c07e39cb603cd4f12e7
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Michael Brasser [Mon, 13 Feb 2012 23:41:26 +0000 (09:41 +1000)]
Remove etcprovider plugin.
Handling image providers via QDeclarativeExtensionPlugin is not a
pattern we want to promote for library code. The plugin was also
missing documentation and autotests. It might be appropriate to be
re-added later as an example showing the use of an image provider with
a texture factory.
Change-Id: I2d8f3208aebd55180bd627b3f9acc0679eb6328c
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Alan Alpert [Fri, 3 Feb 2012 06:31:31 +0000 (16:31 +1000)]
Alter Clocks demo
For further component reuse, it's now a delegate in a view that can load
many more clocks. Also looks better both in landscape and portrait mode.
Change-Id: Ib5f172ee165554dfbe1ab84b96fe0eec7c22b1d1
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Yann Bodson [Wed, 15 Feb 2012 01:06:30 +0000 (11:06 +1000)]
Remove pixmap text caching in TextEdit element
Task-number: QTBUG-24278
Change-Id: Ida9014aceba93c023c88538969dff7e72ef5a6d8
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Michael Brasser [Tue, 14 Feb 2012 23:29:54 +0000 (09:29 +1000)]
Add string comparison test for v4.
Change-Id: Ibd98608ca0c757afdde1db18877a5a92cdeb24ba
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Glenn Watson [Mon, 13 Feb 2012 23:05:12 +0000 (09:05 +1000)]
Fix typo in error string.
Provide correct line/column information in case of error
while creating dynamic qml object.
Task-number: QTBUG-24065
Change-Id: I283408c898706dc6df57e21a57d97bafd56d9aaa
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Aaron Kennedy [Tue, 7 Feb 2012 12:29:45 +0000 (12:29 +0000)]
Add slow animations mode to qmlscene
Change-Id: I0f850258e2cf5363bca2fa1c8b098aa5982eb232
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Jerome Pasion [Thu, 9 Feb 2012 16:31:02 +0000 (17:31 +0100)]
Doc: Overhaul of doc/src/declarative and QtQuick2 docs.
-Consolidated model/view documentation into one.
-Added a new navigation for all overviews (grouped the pages)
-New front page that shows the grouping
-Separated the Qt C++ from the main QML overviews
-Consolidated Qt C++ into the "declarative runtime" section
-New articles about JavaScript, the engine, and plugins
-Fixed the older examples. New snippet comments
-Renamed some of the articles
-kept the qtquick2 qmlmodule
-"Qt Quick Elements"
Moved contents of doc/src/declarative into respective
module dirs.
-Qt Quick 2, LocalStorage, Particles, and QML are now
separate.
-Removed unused or duplicate documentation.
-edited C++ examples
-removed navigation and "\inqmlmodule QtQuick 2" for
those pages that are not in Qt Quick 2
-fixed doc/src/ licenses to header.FDL from qtbase
Change-Id: Ib36f9c07565d91160fa8d04f9670c438f684b82a
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Martin Jones [Tue, 14 Feb 2012 01:57:25 +0000 (11:57 +1000)]
Preserve aspect ratio when setting Image.sourceSize
Setting both sourceSize.width and sourceSize.height results in changing
the image aspect ratio. This is never what you'd want.
Fit the image to the provided sourceSize, maintaining the aspect ratio.
Task-number: QTBUG-21161
Change-Id: I77e9aacb8d31475d5df0aef1de52c0edbd1e2fc9
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Michael Brasser [Tue, 14 Feb 2012 06:40:42 +0000 (16:40 +1000)]
Add new animation elements to element list.
Change-Id: I714555e1255c0190619f313fc26f532f3b6f4c38
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Michael Brasser [Tue, 14 Feb 2012 03:40:29 +0000 (13:40 +1000)]
Cleanup auto.pro.
Start running qmltest tests again. Other minor cleanup.
Change-Id: I0b823e3ac5ce1d894015d683b0a6bb6503538703
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Andrew den Exter [Tue, 14 Feb 2012 02:55:38 +0000 (12:55 +1000)]
Fix access to context properties within TextEdit.cursorDelegate
Don't create the cursorDelegate instance before componentComplete as
the context may not be fully populated prior to that.
Task-number: QTBUG-21780
Change-Id: I6ca8a24989bc28e5c5ca06d61a85e32ff630ce7c
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Bea Lam [Tue, 14 Feb 2012 00:54:56 +0000 (10:54 +1000)]
Fix and stabilise sectionsPositioning() test
The 'Turn sticky footer off' part was setting the content y to 40
which meant the sect_new was already below the last visible item of the
previous section, so turning off the NextLabelAtEnd flag didn't move
sect_new further down the view. (This test only occasionally failed
since the window didn't always update after changing the content y,
but now it changes the content y then waits for a polish before
continuing.)
Change-Id: I6a424f4bbd2eec1904a5fd20eb2bd79d5cac5b84
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Alan Alpert [Tue, 14 Feb 2012 01:26:31 +0000 (11:26 +1000)]
Remove missing image reference
Not really needed for this example anyways
Change-Id: I98fd546441f3fd5e6caa9212cc171dab3000a139
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Andrew den Exter [Tue, 14 Feb 2012 00:18:38 +0000 (10:18 +1000)]
Better document with examples how relative paths are resolved.
Change-Id: Ia52956889216d11d7bb10307f09b582b55d0b4cd
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Rick Stockton [Wed, 8 Feb 2012 00:54:27 +0000 (16:54 -0800)]
modify 'mousearea-example' to run with MANY MORE buttons
The example formerly supported only 'Qt::LeftButton'
and 'Qt::RightButton'. This enhancement shows that qml
can work with any of the buttons supported by Qt itself.
(The example reacts to ALL 27 possible Qt mouse buttons.)
Task-number: QTBUG-24132
Change-Id: Id1c1431175c39eace43e48915a47da8c4f92a1b6
Reviewed-by: Rick Stockton <rickstockton@reno-computerhelp.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Pekka Vuorela [Fri, 10 Feb 2012 15:00:24 +0000 (17:00 +0200)]
Qt.application.inputPanel to make deprecation warning only once
Change-Id: I6db04fdbf648e0b91e7ef21f57b6062813ceb6c5
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Kim Motoyoshi Kalland [Wed, 8 Feb 2012 11:31:17 +0000 (12:31 +0100)]
Fixed QML Item updates after reparenting.
Setting an Item's parent to null caused its scene graph nodes to
be deleted, but resetting the parent to a valid object did not
recreate and update all the nodes.
Task-number: QTBUG-21032
Change-Id: I00f93a481a326ba9b9fb98bf4212479622552783
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Jerome Pasion [Mon, 3 Oct 2011 10:25:14 +0000 (12:25 +0200)]
Doc: Adding images from Qt 5 bundle to doc/src/images.
The declarative images should be in doc/src/image and not in
the bundle. qdoc3 reports errors because it cannot find the
images.
Change-Id: Ie770cf8d0462e0e23cde33d6867dbfe30ae679f1
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Justin McPherson [Mon, 13 Feb 2012 06:16:42 +0000 (16:16 +1000)]
Change variant properties to var properties.
Helps with the use of js objects in test data etc.
Change-Id: I95661118a8ded277c0e1d3c951182dee3f550e12
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Michael Brasser [Mon, 13 Feb 2012 00:11:26 +0000 (10:11 +1000)]
Don't crash when an animation update causes it to delete itself.
Change-Id: Ic108adfb99a09e6ede71d474240fb0917cee6961
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Charles Yin [Mon, 13 Feb 2012 00:43:51 +0000 (10:43 +1000)]
Remove non-standard canvas filter/mirror functions
They are not standard context 2d APIs, and now the same effects can
be implemented by the ShaderEffect/QtGraphicEffects as well, so remove
them from canvas 2d to reduce the duplicated features.
Change-Id: If77ea6794e839a59927a313702aeea2282384844
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Laszlo Agocs [Fri, 10 Feb 2012 11:43:00 +0000 (13:43 +0200)]
Add basic TouchCancel handling to canvas.
This makes sure that touchEvent() is properly called for all items in
the scene that have an active touch. It does not handle the cancel
event in any other special way.
Change-Id: Id66527ced8cb63d0b29f25f37c139e6d6aec9ba0
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Jason McDonald [Mon, 13 Feb 2012 03:30:26 +0000 (13:30 +1000)]
qmltest: Remove obsolete skipAll function.
The skipAll function has been left in qmltest for a transitional period
to give upstream projects time to catch up with the removal of the
function from the API. This transitional period is now finished.
Task-number: QTBUG-21652
Change-Id: I10173ef9a676b804e6cf2e7f6e9a82f7b7b4c078
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Thu, 9 Feb 2012 06:17:32 +0000 (16:17 +1000)]
qmltest: Count passes, fails and skips consistently.
This commit changes qmltest to count one pass per data row, rather than
a single pass for an entire data-driven test function. This makes
counting of passes consistent with counting of fails and skips which
were already counted once per data row. This change also means that the
plain-text, xml and light-xml output formats will now show one result
per data row, so that every data row executed will be shown in the test
output with either a pass, fail or skip result. Previously data rows
that passed were not shown in the output, preventing analysis of total
number of tests runs, pass-rates, and various other metrics.
This commit corresponds to (and depends on) a commit in the qtbase
module which changes the behaviour of qtestlib in the same way.
Task-number: QTBUG-21848
Task-number: QTBUG-22124
Change-Id: I3c1f0e68bdff4087b9ccfc80a3f96f4541335b6f
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Yann Bodson [Sun, 12 Feb 2012 23:52:11 +0000 (09:52 +1000)]
QML Text: make sure that the bounding rect has a y position of 0.
This line was lost in a previous merge.
Change-Id: If3683fa17630452abab115638c1c0ebf0824e2a1
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Justin McPherson [Fri, 10 Feb 2012 06:04:11 +0000 (16:04 +1000)]
Change linkage of datafunction in V8_DEFINE_EXTENSION to static.
Stops interaction with items of the same name elsewhere.
Change-Id: I37ffdc8253d76247f03bd593785a35069636eba8
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Justin McPherson [Tue, 7 Feb 2012 05:31:28 +0000 (15:31 +1000)]
Make sure polish() is reentrant.
Take a copy of the items currently scheduled for polish (and clear the internal
list) to ensure an item can re-add itself to the polish list during an
updatePolish().
Change-Id: I0c629795f64d5926ac87a838ea5e216b6a1fa6cf
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Michael Brasser [Fri, 10 Feb 2012 00:15:13 +0000 (10:15 +1000)]
Fix anchor jitters that could occur during animation.
The anchors were using a different definition of center than the
actual center (
9337c140cab7db1285f893b66d0e56423a74c253). With
this change center-anchored Rectangles may sometimes have fuzzy
antialiasing again.
Task-number: QTBUG-12441
Task-number: QTBUG-21730
Change-Id: Iaf61409c7c523510d0d657fe7ba96f29a8610090
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Charles Yin [Fri, 10 Feb 2012 05:33:53 +0000 (15:33 +1000)]
Track the animationRunning flag correctly in QQuickRenderThreadSingleContextWindowManager
The animationRunning value in QQuickRenderThreadSingleContextWindowManager
should always match the animation driver's running state. When the renderer
starts rendering, should check and update the animationRunning to
the current animation driver's isRunning() value after killing the
animation timer.
Change-Id: I30b55872ae1fc69b8db47ead7f1f2ee86de966c8
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Kai Koehne [Thu, 2 Feb 2012 11:06:06 +0000 (12:06 +0100)]
Debugger: Rename QDeclarativeDebugTrace to QDeclarativeProfilerService
This avoids naming confusion with QDeclarativeTrace + makes it in line
with QV8ProfilerService.
Change-Id: Ifd801655044cff3ffdb2a9695ffc9868eeb51663
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Kai Koehne [Thu, 2 Feb 2012 10:18:08 +0000 (11:18 +0100)]
Debugger: Consistenly use 'state' instead of 'status'
Fix inconsistent naming e.g. in QtDeclarativeEngineDebug by always
using 'state' instead of 'status'. This is in line with the other
source code, which also seems to favor 'state'.
Change-Id: I65a7a3bd0eb7dfffeb37b5f8dad15b0a4a78de70
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Pekka Vuorela [Fri, 3 Feb 2012 08:07:51 +0000 (10:07 +0200)]
Use QInputMethod instead of deprecated QInputPanel
Similarly deprecate Qt.application.inputPanel and
introduce replacement Qt.inputMethod.
Change-Id: Ie4fd467f93f75023c86b0a2d038d858fe5001146
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Sami Kananoja <sami.kananoja@nokia.com>
Martin Jones [Fri, 10 Feb 2012 06:12:10 +0000 (16:12 +1000)]
Flickable containing PinchArea is unresponsive following pinch.
PinchArea was releasing the mouse grab when all touches were
released, causing the mouse release event to not be propagated
to its parents, who were then unable to correct their state.
Remove this code and allow the normal event handlers to do their
thing.
Change-Id: I367772ca13546425fed4bed4438084bdf3c74dde
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Justin McPherson [Thu, 9 Feb 2012 05:48:40 +0000 (15:48 +1000)]
Use only standard API in examples.
Change-Id: I62a864de35c5b595ffda4397edb16342f54a86ce
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Justin McPherson [Thu, 9 Feb 2012 05:46:09 +0000 (15:46 +1000)]
Refactor Canvas rendering paths.
Refactor Canvas rendering paths to enable different drawing contexts.
Change-Id: If0e00a14baa673fca6b999a787b4e89885bb1e51
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Christopher Ham [Wed, 25 Jan 2012 00:50:13 +0000 (10:50 +1000)]
Fix for QTBUG-23862 - Blank screen in Viewport
This patch fixes an issue that causes Qt3D's Viewport to be blank
when its renderMode property is set to BufferedRender.
(QSGPainterNode's RenderTarget is set to FramebufferObject)
Task-number: QTBUG-23862
Change-Id: Ic7a333f79ecf1aa153ef42e213644a17243a3580
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>
Yann Bodson [Fri, 10 Feb 2012 04:48:10 +0000 (14:48 +1000)]
Remove clang warnings in particles
Change-Id: I4fb92a76143e5b9b607bbf9461b27ade3776edf0
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Michael Brasser [Fri, 10 Feb 2012 01:36:37 +0000 (11:36 +1000)]
Update SmoothedAnimation and SpringAnimation to accept default target.
Followup to
f5a43c09dbbf0caece4976303250a7582f6037ec.
Change-Id: I591836996b815f3128b5f67f11efcc644011d6b4
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Martin Jones [Thu, 9 Feb 2012 05:28:29 +0000 (15:28 +1000)]
Use use touch events to generate mouse events in Quick canvas.
Allowing the canvas to deal with mouse event emulation provides
a couple of advantages: 1. touches outside a reactive area can
be ignored, allowing a touch within a reactive area to become
the "mouse touch". 2. we can extend the mouse events with
data available in touch events for use within the quick elements;
specifically velocity in this case.
Change-Id: Id9df397f1a3a03dbda2ef5dcf6189e7eb3377356
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Mathias Malmqvist [Mon, 5 Dec 2011 19:21:33 +0000 (19:21 +0000)]
Added new convenience readonly visibleChildren property to Item
Change-Id: I5ec541226fabd72c05ce8ccb8bb7e56f6ec7717a
Task-number: 22724
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Alan Alpert [Thu, 9 Feb 2012 09:40:34 +0000 (19:40 +1000)]
Doc fix
Change-Id: I94712d5e7ca81618c4c506f5984ff94c46b730dd
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Charles Yin [Thu, 9 Feb 2012 03:00:07 +0000 (13:00 +1000)]
Remove deprecated builtin sql database API.
The new local storage API has been implemented as a standalone module plugin
for a while, and qtquick1 has been moved into a seperated repo, so
the old API can be safely removed now.
Task-number:QTBUG-21538
Change-Id: Ib89f34797afe492ad4987d5afa8ff23cdca044ab
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Kai Koehne [Tue, 20 Dec 2011 13:26:39 +0000 (14:26 +0100)]
Debugger: Allow trace service to send data on exit
Add a statusAboutToBeChanged virtual that allows
services to send data e.g. on application exit.
Change-Id: I28fa513ab2a12d6973c444aac3062d64a0957207
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Christiaan Janssen [Thu, 9 Feb 2012 11:48:29 +0000 (12:48 +0100)]
QmlProfiler: add filename to "Compiling" events location
Change-Id: I58c4cae59790bed6a921f7e94d97ee84ba3e6777
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Gunnar Sletta [Wed, 8 Feb 2012 07:09:11 +0000 (08:09 +0100)]
Pass the QQuickCanvas to texture factories.
This makes it a lot more convenient as we then have direct access to the
GL context, createTexture(), invalidation signal and more.
Change-Id: I114514d1379c4d0efcc35c512fa2b485da3438b0
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
Andrew den Exter [Thu, 9 Feb 2012 06:14:40 +0000 (16:14 +1000)]
Add linkColor property to Text.
Allows the color of links in text to be changed from the default blue.
This currently only works with StyledText and the distance field
rendererer. It could be made to work with RichText overwriting the
specified foreground color in all instances or by not setting a default
color in the html parser. The former would prevent the color being
set with CSS or some future means for altering text formats. The latter
would break rendering with QPainter.
Task-number: QTBUG-23048
Change-Id: I98df215cabe8a089f648fd4a6206622b4318fb8f
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Chris Adams [Thu, 2 Feb 2012 04:51:17 +0000 (14:51 +1000)]
Check dynamic slot function for nullness before evaluation
Previously, we didn't check whether the function object handle
associated with a dynamic slot's method index was null before
attempting to evaluate it, which could cause a crash in some
circumstances. This change also adds better error reporting
during function compilation.
Task-number: QTBUG-24064
Task-number: QTBUG-24037
Task-number: QTBUG-23387
Change-Id: I3c5e35e8c16187870125736013a5935fcc5cb1f2
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Alan Alpert [Wed, 25 Jan 2012 09:18:25 +0000 (19:18 +1000)]
Use QDeclarativePixmap in the Particle System
This allows for source URLs to come from network sources.
Change-Id: I416edca010e77e507598eaf4eead4291f044f379
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Jason McDonald [Tue, 7 Feb 2012 02:42:05 +0000 (12:42 +1000)]
Remove code related to test location.
Testlib no longer does anything with the test location and neither do
any of Qt's tests, so this code is no longer needed.
Change-Id: Ic370b6b741382a90454c893bffcab4a7328a2f9e
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Gunnar Sletta [Wed, 8 Feb 2012 09:19:39 +0000 (10:19 +0100)]
Make use of the new maybeAdvance animation logic inside the animation system
Change-Id: Ifef986241d4817fe1e8f8cb94b9640b2bcec0d29
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Chris Adams [Fri, 30 Dec 2011 03:20:33 +0000 (13:20 +1000)]
Handle exceptions while compiling v8 bindings
Previously, no exception handling existed, which could cause a crash
if an invalid v8 binding expression was generated. Such invalid
bindings should usually be rewritten into valid form by the bindings
rewriter, but in some cases it is too costly to do so, so we need
to handle exceptions.
Task-number: QTBUG-24064
Task-number: QTBUG-23387
Change-Id: I7da12a936780a561c9e9cad3a4a7b62c06d6973e
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Jason McDonald [Thu, 9 Feb 2012 00:20:36 +0000 (10:20 +1000)]
Fix error in qdeclarativeecmascript autotest.
The test did not correctly ignore warning messages, but instead ignored
too many messages for one data row and too few for another data row.
This error was exposed when testlib was changed in qtbase commit
d9e35e2884cc75969f0eb860082ea11f8bb95a64 to be more strict with checking
that all ignored messages are correctly produced.
Task-number: QTBUG-24156
Change-Id: Iae73fb26bda83317256c504a8cb3d45783444f66
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Damian Jansen [Thu, 9 Feb 2012 01:25:59 +0000 (11:25 +1000)]
UI improvement for TwitterFriends example
Remove need to erase pre-existing text in TextInput
More likeable input field
Change-Id: I253c0a871079ebedecb96a4b2e27998e82cb10c2
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Michael Brasser [Thu, 9 Feb 2012 01:18:27 +0000 (11:18 +1000)]
Fix warnings reported by clang.
Change-Id: Ifa850c2848c61319cb2465d7fcfffc7fef630923
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Alan Alpert [Thu, 9 Feb 2012 01:12:31 +0000 (11:12 +1000)]
Don't crash if focus issues arise.
The test has some strict focus requirements, but if they are not met
then the test should FAIL with a bit of explanation instead of crash.
Change-Id: I796e8a8092833f3413b3dc98a22466575dfe241d
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Alan Alpert [Tue, 31 Jan 2012 22:07:39 +0000 (08:07 +1000)]
Rewrite multiline strings properly
Because the bindings rewriter works on code strings, it would leave
multiline strings across multiple lines (which is illegal in ECMAScript.
It now manually breaks them up when it sees them, by replacing a \n
character with a literal \n.
Since RewriteSignalHandler now likes to have the AST passed in too, the
related method in QDeclarativeCompiler (and its customers) have been
altered to use the QDeclarativeScript::Value instead of just a string.
Task-number: QTBUG-23387
Change-Id: Id060de37e70590c9da2a902038ed02d948fdd70f
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Jason McDonald [Tue, 7 Feb 2012 05:09:44 +0000 (15:09 +1000)]
qmltest: Perform extra checks after each data row is executed.
Add calls to the new function QTestResult::finishedCurrentTestData() to
verify that expected failures and expected messages have been produced.
Change-Id: Ia139a962c705a5f47be992b7f2e81775aa2e2f28
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Charles Yin [Wed, 8 Feb 2012 06:26:06 +0000 (16:26 +1000)]
Add missing interface declaration
Change-Id: I18774f01b78f160b53c3ee96f1fe3a4cc8ce4950
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Jamey Hicks [Wed, 8 Feb 2012 14:42:16 +0000 (09:42 -0500)]
Update documentation on QJSEngine::newQObject to match implementation.
Change-Id: Id38244dd78b7d562dad14e08555fb55d2e0815fa
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Gunnar Sletta [Wed, 8 Feb 2012 07:06:17 +0000 (08:06 +0100)]
Use a singleton for the plugin.
The factory is created from the QQuickCanvas constructor
before any alternative threads are started and doesn't need
this kind of protected. In addition this caused problems on
shutdown if multiple custom contexts where created.
Change-Id: Ifdd9bde0c65aa7c399722aea33af78087a2465b4
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Caroline Chao [Tue, 7 Feb 2012 11:35:58 +0000 (12:35 +0100)]
CodeCoverage: Fix wrong type passed to saveCoverageTool.
Passing a bool as appropriate.
Change-Id: I0dcca8d30c6d75e7fcddcf7047e1dd1c572ec6ea
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Alan Alpert [Wed, 8 Feb 2012 05:16:50 +0000 (15:16 +1000)]
Switch to QMetaType::Type
Looks like this change was made to QVariant for Qt5, slight behavioural
difference because floats are now a separate case.
Change-Id: Ia9d420b03454c13c97515ab9c89b743a668b37e2
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Glenn Watson [Tue, 7 Feb 2012 23:36:18 +0000 (09:36 +1000)]
Provide determinant accessor in render state structure.
This allows custom renderers to set the determinant to a value
different than the actual model view transform matrix. This is
useful when parts of the scene node transformation are done on
the CPU rather than in the vertex shader.
Change-Id: Icf26a5922b0933275a61af4656cf842bf61e70d5
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Gunnar Sletta [Wed, 8 Feb 2012 13:29:44 +0000 (14:29 +0100)]
Disable broken test
Change-Id: I3588153c37ef3d2ced43dba308502dd06428e0a6
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Gunnar Sletta [Fri, 3 Feb 2012 10:17:29 +0000 (11:17 +0100)]
Added QQuickCanvas::setRenderTarget(uint fbo, const QSize &size)
This allows to hook in non-QOpenGLFrameBufferObject FBO's also
Change-Id: I8a2f8f7f15d5a92262bdbb0507b232d7c11fdf25
Reviewed-by: Jani Hautakangas <jani.hautakangas@nokia.com>
Bea Lam [Fri, 3 Feb 2012 03:18:05 +0000 (13:18 +1000)]
Accept default targets for transitions
QDeclarativeAbstractAnimation::transition(),
QDeclarativeTransition::prepare() and QDeclarativeTransitionManager
now accept a QObject* to specify a default target for a transition.
For view transitions, this will allow the view to pass a view item
as the default target for a view transition so that the Transition
does not have to explicitly set the target for every animation.
Change-Id: I2c8d5535283335e139d98ef56f399f338627fb3e
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Michael Brasser [Mon, 6 Feb 2012 03:27:34 +0000 (13:27 +1000)]
Don't hide virtual method.
Task-number: QTBUG-20994
Change-Id: Iaeeb23ed758ef52e0a3a61c4310aafec383e8a28
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Kim Motoyoshi Kalland [Wed, 18 Jan 2012 13:58:54 +0000 (14:58 +0100)]
Let Item.layer.samplerName be a QByteArray instead of QString.
Both Qt's property system and OpenGL shaders use 8-bit characters,
so there is no need to use a QString for samplerName.
Change-Id: I8cc29c74adb5d71a34cc99d9ecebbbba8b554cdf
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Kim Motoyoshi Kalland [Tue, 17 Jan 2012 16:06:08 +0000 (17:06 +0100)]
Allow Item components to be assigned to Item.layer.effect.
Some complex effects are easier to implement as Items using
ShaderEffects internally rather than with a top-level ShaderEffect.
Auto-tests added.
Change-Id: I4b99811b87e7ca5054bf119b99207b7f5a7c666e
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Michael Brasser [Tue, 7 Feb 2012 00:22:09 +0000 (10:22 +1000)]
Initialize value.
Change-Id: Ibfb045827a38021fcfa43e735823ad346c5c066c
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
Andrew den Exter [Tue, 7 Feb 2012 07:52:52 +0000 (17:52 +1000)]
Resolve StyledText img tags relative to baseUrl.
Change-Id: I954195d52330c65e851b7c0fcdb6c8dabf29335d
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Kim Motoyoshi Kalland [Tue, 17 Jan 2012 15:49:13 +0000 (16:49 +0100)]
Fixed some Item.layer bugs and added auto-tests.
Change-Id: I3f66f911d1c499c37a66904f8ddab6951ba85e60
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>