Charles Yin [Tue, 13 Mar 2012 01:47:59 +0000 (11:47 +1000)]
Improve mouseWheel() function
Use new angleDela() API and update the documentation.
Change-Id: Ie01c979d8c411e81165caedc7e020e39f9d64371
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Michael Brasser [Mon, 2 Jul 2012 00:36:35 +0000 (10:36 +1000)]
Improve wheel event handling.
Use new angleDelta() rather than deprecated event data.
Change-Id: I28d0a1ff1bc99b35e1ce3d553e5cb9bdc9362f4c
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Martin Jones [Wed, 4 Jul 2012 05:27:31 +0000 (15:27 +1000)]
Mark QQmlComponent::createObject() and incubateObject() as internal
These functions are for use in QML Component. They are not part of
the C++ API.
Change-Id: I92743a3b31c2864976756e2d6d76c9057aee9c1d
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Chris Adams [Fri, 29 Jun 2012 02:59:47 +0000 (12:59 +1000)]
Improve performance guide
This commit improves documentation about binding optimisation and
positioning.
Task-number: QTBUG-21720
Task-number: QTBUG-25844
Change-Id: Ib2c23583adee9207dfdee9f9d4ec5473fe2a7ec6
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Michael Brasser [Mon, 2 Jul 2012 01:50:15 +0000 (11:50 +1000)]
Report correct mouse position when made visible with hoverEnabled.
Task-number: QTBUG-24282
Change-Id: I778b2db18c28e2b33690531ec19eb24ecf444a38
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Chris Adams [Mon, 2 Jul 2012 07:21:45 +0000 (17:21 +1000)]
Fix qmlRegisterModuleApi function linkage
The qdoc tag for the \fn doc was incorrect, leading to linkage errors.
Task-number: QTBUG-26236
Change-Id: Ifd407915d9a1461bb2b48a6bf54bb085425ba76b
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Andrew den Exter [Thu, 21 Jun 2012 06:44:30 +0000 (16:44 +1000)]
Refresh the TextInput.acceptableInput property when validator changes.
Task-number: QTBUG-26260
Change-Id: I404640d9a2f000976887dcc2119f971c17a71c7e
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Glenn Watson [Sun, 1 Jul 2012 23:10:49 +0000 (09:10 +1000)]
Make Behaviors work correctly with value types.
When a value type is referenced by sub-component a grouped
property is built. This code path did not handle behaviors being
declared on the entire value type. Add support for value interceptors
in this code path. Also issue an additional write to the value
type property before calling the interceptor on components
that are not being intercepted, so that the other
sub-components don't get stale values during write back.
Task-number: QTBUG-22625
Change-Id: I3365f422dfa1ab2e536e19575efcceceffb85e10
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Andrew den Exter [Thu, 28 Jun 2012 02:23:01 +0000 (12:23 +1000)]
Add tests for triple click text selection in TextEdit.
Includes a minor behavioural fix for selectedText and getText so that
they return plain text strings for plain text content rather than the
raw text from QTextDocument which substitutes line break characters
with unicode line or paragraph separator character. Rich text
documents still return the unicode characters.
Change-Id: I19a3a5bba2e4ebb0e6607e19c915a588a9a6c7db
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Andrew den Exter [Thu, 28 Jun 2012 02:50:15 +0000 (12:50 +1000)]
Don't calculate selection rects unnecessarily.
QQuickTextEdit ignores the updateRequest QRect arguments, so don't
bother calculating them.
Change-Id: Icb9126ab799c6b216eb0c4b9e3ff3f6a4bf8f03c
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Andrew den Exter [Wed, 27 Jun 2012 06:37:17 +0000 (16:37 +1000)]
Remove dead code from QQuickTextControl.
Either unused functions, or code paths for signals that aren't
connected to anything.
Change-Id: Ide24f1263d05f93917a16a3c17cb06a619cd3421
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Martin Jones [Fri, 29 Jun 2012 01:57:02 +0000 (11:57 +1000)]
Section headers ignore list delegate size changes when "colliding"
Make section header updates part of the layout process.
Task-number: QTBUG-23298
Change-Id: I4586bc58bc195fcc47f6db79346727eb6e3d3845
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Andrew den Exter [Tue, 3 Jul 2012 02:29:57 +0000 (12:29 +1000)]
Allow mouse interaction with 0 opacity items.
Don't filter event delivery to items with 0 opacity, and update the
documentation the for opacity, visible and enabled properties and how
each affects event delivery.
Task-number: QTBUG-19193
Change-Id: Id48e4af763c9a7bbcc13b303342d303155dcadc9
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Bea Lam [Fri, 29 Jun 2012 06:17:43 +0000 (16:17 +1000)]
Remove QSKIP() for polishOnCompleted() test
The test passes reliably now on Mac.
Task-number: QTBUG-21590
Change-Id: I99b9d73cd8bbdd3f0b7df19e148bc02be6227289
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Girish Ramakrishnan [Tue, 3 Jul 2012 05:16:13 +0000 (10:46 +0530)]
Suppress QWindowSystemInterface inclusion warnings
QWindowSystemInterface is now part of QPA API and should
be included using <qpa/*>.
Change-Id: I90c71e193d77765b4ec7b92fdbe611b387b2ae4a
Reviewed-by: Andrew Stanley-Jones <andrew.stanley-jones@nokia.com>
Martin Jones [Tue, 3 Jul 2012 05:04:19 +0000 (15:04 +1000)]
Allow resetting a Rectangle gradient.
If a gradient and a color are set on a rectangle, the gradient is used.
This means that if you wish to override the gradient on a component with
a color, you have to unset the gradient.
Also remove the unused QQuickGradient::gradient() method.
Task-number: QTBUG-23238
Change-Id: Ibd43cfe1bd4b867e4f6103f1d0dc0ed6176ab5c1
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Michael Brasser [Tue, 3 Jul 2012 00:51:17 +0000 (10:51 +1000)]
Fix some commented issues from the refactor merge.
Change-Id: Ied56bdfc93162b7668be7b07841948b8b5968a70
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Glenn Watson [Tue, 3 Jul 2012 01:04:02 +0000 (11:04 +1000)]
Add nativeScanCode to KeyEvent.
Allow the Qt nativeScanCode value to be passed through to the
QML event handler.
Task-number: QTBUG-18590
Change-Id: If598e0d65adc0e9bc29cca773a0bda2c8037b661
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Andrew den Exter [Tue, 3 Jul 2012 00:03:44 +0000 (10:03 +1000)]
Add tests for QQuickListCompositor debug output.
Change-Id: I7abb00a28ad4939f95ca743cb35f6947c2ab1010
Reviewed-by: Damian Jansen <damian.jansen@nokia.com>
Andrew den Exter [Tue, 3 Jul 2012 00:16:08 +0000 (10:16 +1000)]
Remove outdated refactor comments.
It's not necessary to check whether the canvas has focus when gaining
active focus, as the focus of the root item follows the window focus
so an item should never gain active focus if the window doesn't have
focus.
Change-Id: I8992f673fb64467869d5fb9d23d011f19219feed
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Andrew den Exter [Mon, 2 Jul 2012 03:22:34 +0000 (13:22 +1000)]
Remove unused private API.
These functions may serve a future purpose but at the moment are unused
and untested.
Change-Id: If7c661f10859cc23202f90eb3c5304bf1a8dc217
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Robin Burchell [Mon, 2 Jul 2012 09:19:56 +0000 (11:19 +0200)]
android: don't unconditionally use execinfo.h
android (a superset or subset, depending on your POV) of Linux doesn't seem to
have execinfo.h, so disable it there.
also simplify the conditional a little so we don't have to alter this all over
the place if the platform support changes in the future.
Change-Id: I937b04f363dfff2b10e1696f11e67d4ba55b3b06
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Nils Jeisecke [Mon, 2 Jul 2012 13:38:24 +0000 (15:38 +0200)]
Fix high CPU load for Qml TextEdit on Mac
This removes a Mac workaround which causes an endless calling loop
(updatePaintNode will call markContentsDirty will call updatePaintNode) for
every TextEdit element. The only reason that
this doesn't block the application is that the signal goes through the
GUI thread's event loop.
Task-number: QTBUG-26361
Change-Id: Ia89cc123959bbfdcbfc5b0707901ac91dec47c40
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
Chris Adams [Mon, 23 Apr 2012 06:37:05 +0000 (16:37 +1000)]
Fix crash in QQmlXmlHttpRequest
If an onreadystatechange handler of a QQmlXmlHttpRequest uses code
which requires the engine->callingContext() to be valid, a crash
could previously occur (since the callingContext() would be null
if the handler was called due to a network request finishing.
This commit saves the calling context on send, so that on dispatch
we can create an activation scope from that context and use it.
Note that even in this case, if the original context had previously
been deleted (e.g., by a loader deleting the item context on source
change) the saved context could be invalid by the time the dispatch
function was invoked. In that case, we simply do nothing as the
function call cannot succeed (invalid context).
Change-Id: Iba357829a69433c11cc279e6cc9fdc0bedaa31fb
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Bea Lam [Mon, 2 Jul 2012 01:25:44 +0000 (11:25 +1000)]
Update glossary of terms
Change-Id: Icf0a41bbcd5654a112b7979e00d7a708548808ba
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Andrew den Exter [Thu, 17 May 2012 05:18:19 +0000 (15:18 +1000)]
Use QQmlDataTest to resolve qqqmlanguage test data paths.
Fix failures in shadow builds.
Change-Id: I008b76cfc0934e87edf07e79aec32bdeedf7d015
Reviewed-by: Damian Jansen <damian.jansen@nokia.com>
Robin Burchell [Sat, 23 Jun 2012 07:15:10 +0000 (09:15 +0200)]
Remove QQuickImageBase's explicitSourceSize.
The only case where this really did anything was in resetSourceSize() to avoid
resetting if it had not been set already, but this logic is already in
setSourceSize too, so it's really not useful.
Done-with: John Brooks <john.brooks@dereferenced.net>
Change-Id: Idb86686ea5ab711ceb2390e3703e0e04f7d537bb
Reviewed-by: John Brooks <john.brooks@dereferenced.net>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Martin Jones [Mon, 2 Jul 2012 01:52:08 +0000 (11:52 +1000)]
section.property cannot deal with nested properties
Handle nested property names in section.property.
Task-number: QTBUG-24569
Change-Id: I0ea6003313108b8232bcd3a3015a4dbbd0753cec
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Andrew den Exter [Fri, 29 Jun 2012 07:20:16 +0000 (17:20 +1000)]
Use the convential form for the selectedText notify signal name.
Rename selectionChanged to selectedTextChanged to address an apparent
difference to API between TextInput and TextEdit.
Task-number: QTBUG-19732
Change-Id: Ibc589c8b43567cb8d2f8c13f7366e2859c7f09d7
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Bea Lam [Thu, 28 Jun 2012 07:05:43 +0000 (17:05 +1000)]
Document various changes to types and modules in QtQuick2
Document various properties and modules that have been added or changed
in QtQuick2.
Change-Id: I7e0aca10ee0476fbabe1ae2c88a83aba19999969
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Martin Jones [Fri, 29 Jun 2012 03:08:41 +0000 (13:08 +1000)]
anchors.mirrored should not exist in QtQuick 2
anchors.mirrored was removed from QtQuick 1.1 before release, however
QtQuick 2 was branched before it was removed, so it currently exists in
QtQuick 2.
Task-number: QTBUG-26369
Change-Id: Iab85f66f6c5f0ebadc5962cc6962cec15203d55d
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Glenn Watson [Thu, 28 Jun 2012 01:11:05 +0000 (11:11 +1000)]
Work around test failure for pixmap cache.
A deadlock condition can occur in the qtbase network management
code. Added a work around for the bug, and marked the test as
significant for CI on Ubuntu 10.04 LTS.
Task-number: QTBUG-25307
Change-Id: I6c11645d29dfd34b564f0a811c6f3470b8f31312
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Adriano Rezende [Sun, 26 Feb 2012 16:27:34 +0000 (17:27 +0100)]
Adjust MouseArea autotest to check mouse events with transformations
Tests mouse events with graphical transformations applied to the element.
Change-Id: I4b69e35cde4125aa047fa18357b22b898da92c20
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Andrew den Exter [Fri, 29 Jun 2012 05:40:18 +0000 (15:40 +1000)]
Remove QQuickItemPrivate::InitializationStatus.
Unused following changes to focus handling of unparented items.
Change-Id: I18b8c1a233a62050d3e43786cc093b039697c922
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Andrew den Exter [Fri, 29 Jun 2012 01:49:33 +0000 (11:49 +1000)]
Fix memory leak when cancelling incubation of view items.
Don't cancel incubation of referenced object, but if incubation is
cancelled remove the scriptRef held by the incubator so the data object
can be released, not just when incubation has inititialized but not
finalized an object.
Change-Id: If2d6a4c4409dbd771d7131782023aa5e2d08eeed
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Friedemann Kleint [Fri, 29 Jun 2012 08:01:21 +0000 (10:01 +0200)]
MSVC: Fix warnings about struct/class mismatch.
Change-Id: I7cc5b01279069229711dbdf0b28e935ab3391c08
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Oswald Buddenhagen [Fri, 29 Jun 2012 12:40:24 +0000 (14:40 +0200)]
remove stale references to QTDIR_build
after the buildsystem changes, qtbase's .qmake.cache is not longer
included by other modules, thus the QTDIR_build condition will now never
trigger, causing various breakages.
and as nowadays modules can be build as part of qt or standalone without
any changes, the conditon makes no sense to start with.
Change-Id: I4a2ed6153577b6d064ab0dc407ce99f31b1263ac
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Chris Adams [Wed, 27 Jun 2012 07:28:32 +0000 (17:28 +1000)]
Improve documentation for module APIs
Previously, it was not made clear to plugin developers why they might
wish to implement a module API. This commit adds documentation which
describes how module APIs can be useful, in the same section as the
other qml type registration explanatory documentation.
Task-number: QTBUG-25731
Change-Id: I2350ce8e5ae90598a65295fb2afb7dbd23eb7da6
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Bea Lam [Wed, 27 Jun 2012 06:49:20 +0000 (16:49 +1000)]
Add porting guide for QML apps
Change-Id: Ie633b5c7457a6223b49dca35b07cf1d5ad723fc7
Reviewed-by: Martin Jones
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Alan Alpert [Mon, 18 Jun 2012 04:13:31 +0000 (14:13 +1000)]
Update particles examples en masse
Change-Id: I882f59c687d790bc55cf59abf6f0ea80b65b50d9
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Alan Alpert [Mon, 25 Jun 2012 02:01:46 +0000 (12:01 +1000)]
Rename speed -> velocity in the particle system
Matches the convention set in the QtQuick module, for example by
ListView and Flickable.
Change-Id: I8df57ed1ced8128723d790c30c00cc1b2062787d
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Michael Brasser [Thu, 28 Jun 2012 05:20:13 +0000 (15:20 +1000)]
Remove dead code.
Change-Id: I2e206d746cc48ff7bab29b2135d03b70f85e39d6
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Shawn Rutledge [Tue, 26 Jun 2012 16:00:59 +0000 (18:00 +0200)]
Propagate synthesized mouse events in parallel with touch.
The old way of event propagation inside QQuickCanvas was to send the
touch event through all elements, and if it was accepted along the
way, stop. Otherwise generate a mouse event and propagate it through
the items in the same way.
With this patch the behavior is changed instead to do the propagation
in parallel. The idea is to first send a touch, then a mouse event to
each QML item (in paint order) that can potentially handle the events.
When items filter their child elements, the same logic applies.
Other changes/clarifications:
- mouse events no longer get synthesized for more than one touch point
- TouchPoints can be distributed to multiple Items
- if an item accepts a touch point, it always gets updates, even if
the point is stationary
- events containing only stationary TouchPoints are discarded
- PinchArea must accept any initial single TouchPoint in order to
receive subsequent updates, even though it's not pinching yet.
This means if PA is on top, items underneath don't get touches.
New unit tests showing this behavior were added.
This patch was written by Frederik Gladhorn,
Laszlo Agocs and Shawn Rutledge.
Due to the complexity of the logic some refactoring was done.
QQuickMouseEventEx has been removed because it inherently relied on
using the QEvent d pointer.
Change-Id: If19ef687d7602e83cc11b18d2fecfbbdb4e44f5c
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Friedemann Kleint [Thu, 28 Jun 2012 13:00:55 +0000 (15:00 +0200)]
Fix exports in QtQuickParticles.
Undo breakage introduced by
27416448a1c3259ecad80172ba35ab9aa504a78d.
Change-Id: Ia01a97688ecb91137a2649948af7479bd8323936
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Bea Lam [Thu, 28 Jun 2012 01:42:41 +0000 (11:42 +1000)]
Fixes for QML Basic Types docs
- Standardize the \brief and introductory lines for each type
- Explain that some C++ types match to basic types, e.g. QFont -> font
- Explain that URL values don't match against their input string values
- Fix list type docs and don't encourage its use for custom properties
(use var instead)
- Remove action since QAction isn't registered as a QML type anymore
- Document that color type has r,g,b,a properties
- Do some other cleaning up
Change-Id: Ie8a2886b938166938618c3a0bf47363f443ee401
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Michael Brasser [Thu, 28 Jun 2012 01:27:23 +0000 (11:27 +1000)]
Add basic documentation for QML translation functions.
Change-Id: I50932ffd956061dd172616c4de863eb1a322394d
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Andrew den Exter [Mon, 25 Jun 2012 05:20:53 +0000 (15:20 +1000)]
Use resolved font name for key in distance field cache.
On windows at least multiple QRawFonts can share a family name but
have different font engines. Prefer the faceId information when
constructing a key for the distance field cache to avoid a conflict.
Task-number: QTBUG-26201
Change-Id: I9111f22045eb35e6535039117ec4184075e778a4
Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>
Martin Jones [Wed, 27 Jun 2012 05:29:54 +0000 (15:29 +1000)]
PathView element with 1 item moves in wrong direction when dragged right
The shortest direction calculation used integer math to determine
which direction to move. For an odd modelCount, the wrong direction
could be chosen. For a modelCount of 1 it was particularly obvious.
Task-number: QTBUG-21337
Change-Id: I5e75c74153a5b4c62d1536226cd0703dcae04178
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Oswald Buddenhagen [Wed, 27 Jun 2012 06:26:26 +0000 (08:26 +0200)]
Merge "Merge branch 'buildsystem'" into refs/staging/master
Martin Jones [Wed, 27 Jun 2012 04:05:38 +0000 (14:05 +1000)]
Changing PathView offset doesn't set currentIndex appropriately
If the highlightRangeMode is StrictlyEnforceRange then the
currentIndex should always be updated when the path offset changes.
Task-number: QTBUG-19835
Change-Id: I2371e5abd430e770bbb8f9f9d5f4e1d17e0d8ff5
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Martin Jones [Wed, 27 Jun 2012 01:12:20 +0000 (11:12 +1000)]
QQuickView doc improvements.
Task-number: QTBUG-23193
Change-Id: I8ae081256dabe838e88d1d11713d99ed48b5a0d5
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Michael Brasser [Tue, 26 Jun 2012 03:45:35 +0000 (13:45 +1000)]
Document the concept of creation context for QML Components.
Task-number: QTBUG-18011
Change-Id: I78d13df70a20fd9286a20fad4cc09f21591d3f9a
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Bea Lam [Tue, 26 Jun 2012 04:12:12 +0000 (14:12 +1000)]
Reorganise release notes for QtQml and QtQuick
This separates the "what's new" docs into different pages
under qml/ and quick/ and reorganizes the content structure.
Change-Id: I8a9c437caec75178c44b89b40507ea50f1b8faff
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Martin Jones [Wed, 27 Jun 2012 02:51:43 +0000 (12:51 +1000)]
Document the arg() function QML adds to the String prototype.
Task-number: QTBUG-23577
Change-Id: I6279860bd3bf2d60bc394c012ea1c64bdd9be6fa
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Kent Hansen [Fri, 15 Jun 2012 09:47:56 +0000 (11:47 +0200)]
Implement QAbstractDeclarativeData::isSignalConnected hook
QQml_isSignalConnected is no longer needed, since
QObjectPrivate::isSignalConnected will now call the declarativeData
hook.
Change-Id: I0685b0fa909d6c6c2d275bfa8d41100d9926a046
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Michael Brasser [Wed, 27 Jun 2012 03:05:14 +0000 (13:05 +1000)]
Remove qtbase pin.
Change-Id: Ieec75d0e4b3063000e44bfd109a92c5e79754240
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Matthew Vogt [Fri, 4 May 2012 01:55:00 +0000 (11:55 +1000)]
Consistent use of syntax in V4 Register class
Use the construction/destruction wrapper functions consistently.
These are required for template types because the syntax to invoke
the destructor directly confuses GCC.
Change-Id: I4a6c9239972a96f84a601b4f4a8aeebfd75044a9
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Matthew Vogt [Fri, 22 Jun 2012 05:32:46 +0000 (15:32 +1000)]
Add enum values from related types
If moc marks a type as being related to another type (by using that
type's enums or properties), then include the enum values exported
by the related type in those exposed by the dependent type.
Task-number: QTBUG-22675
Change-Id: I78e72791a4f470200a9ba986a865ffac6c873725
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Glenn Watson [Tue, 26 Jun 2012 23:36:13 +0000 (09:36 +1000)]
Fix performance issue with BorderImage element.
When a small source image is used in repeat mode, a large number of
vertices and indices can be generated by the current algorithm.
Change the geometry hint to static data, so the renderer plugin will
store the data in a VBO in GPU memory.
Task-number: QTBUG-21728
Change-Id: I07b3172eef8569bec2f4acebfb7965625bb5e63b
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Thiago Macieira [Sun, 24 Jun 2012 22:11:00 +0000 (00:11 +0200)]
activeWindow is deprecated, use focusWindow.
This complements commit
2753e9a795537df10c5a3b64ec9f6d8d81381837,
which had begun fixing this issue, but not completed the entire
module.
Change-Id: I2d167e467c5553cfa49e04410aec9a7d98c7fc6e
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Thiago Macieira [Tue, 26 Jun 2012 13:59:57 +0000 (15:59 +0200)]
Do not depend on indirect inclusions: #include and forward-declare
QObject is now no longer indirectly included by qpair.h, so let's make
sure it's forward-declared before use.
qpair.h also no longer includes qdatastream.h, so #include
"qdatastream.h" before using QDataStream.
Change-Id: I698b905cb55d9dce0637f534dc5efeffe5ff882e
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Glenn Watson [Tue, 26 Jun 2012 04:52:27 +0000 (14:52 +1000)]
Support JS Date object in ListModel with static roles.
ListModel uses static roles by default for performance reasons. Add
JS Date object to list of supported types in this mode, via implicit
conversion to QDateTime.
Task-number: QTBUG-24456
Change-Id: Ifaa1a8d16290e87b61239ed351a949d66a02990c
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Kent Hansen [Tue, 26 Jun 2012 12:13:09 +0000 (14:13 +0200)]
Pin the qtbase SHA1
Needed in order to get through
https://codereview.qt-project.org/#change,29193 in qtbase.
https://codereview.qt-project.org/#change,29194 adapts qtdeclarative
to the change.
Change-Id: Ibc5adbaf40a94e23cffb29177fff137e79efa7da
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Oswald Buddenhagen [Tue, 26 Jun 2012 15:59:46 +0000 (17:59 +0200)]
Merge branch 'buildsystem'
Change-Id: I230e776290761be7c811c3aec4d915367012fc99
Thiago Macieira [Tue, 26 Jun 2012 13:05:19 +0000 (15:05 +0200)]
initializeGLFunctions is deprecated, replace it
Change-Id: I102bf78522a0d5b14dc8ce2c1d189f10634d7905
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Oswald Buddenhagen [Thu, 12 Apr 2012 10:09:53 +0000 (12:09 +0200)]
build system cleanups
- load(qt_module) => load(qt_build_config)
- remove:
- CONFIG+=module (obsolete)
- setup of PKGCONFIG* variables (automated now)
- code relating to module version headers (automated now)
- %mastercontent assignment (automated now)
- QT_BUILD_*_LIB defines (automated now)
- pointless QPRO_PWD assignments
- pointless and commented out include and depend paths
- qmake -project boilerplate
Change-Id: Ib2d80a375e88bae1b50a22a274374b7e2cc2a86c
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Oswald Buddenhagen [Wed, 11 Apr 2012 19:53:15 +0000 (21:53 +0200)]
use auto-defined QT_BUILD_*_LIB variables
Change-Id: Iefe0b0982ee482bc47b4f66e514a7d0900674e42
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Oswald Buddenhagen [Tue, 3 Apr 2012 17:31:05 +0000 (19:31 +0200)]
auto-generate module pris
Change-Id: I90090bcf60ecc2c3fb31a38129edeae8ff0f1c55
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Oswald Buddenhagen [Tue, 3 Apr 2012 18:59:13 +0000 (20:59 +0200)]
remove pointless qmltest conditionals
it is a module within this repository, and consequently the flag is
always set.
Change-Id: I8ffdd6903b1b0835725b824a9deb961d0124ce11
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Oswald Buddenhagen [Mon, 21 May 2012 09:38:24 +0000 (11:38 +0200)]
don't reference $$QT_BUILD_TREE - it's unavailable here
Change-Id: Iafef42747b07c900ae22f202c7dfc5c49a1b0f67
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Oswald Buddenhagen [Tue, 3 Apr 2012 17:39:04 +0000 (19:39 +0200)]
don't rely on qtbase sources
copied from qtquick1
Change-Id: I10f57f5563459a0784b8434a992a878fad401da8
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Oswald Buddenhagen [Tue, 22 May 2012 16:18:46 +0000 (18:18 +0200)]
fix include style
so it builds without . in includepath
Change-Id: I5815c636dfcc3d45fad70321a0aab09f5295ca8d
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Pekka Vuorela [Tue, 26 Jun 2012 12:07:09 +0000 (15:07 +0300)]
Remove unnecessary obsolete include
Change-Id: Id1e61e223996624fef0d21dfb6a0b6e6726ceed6
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Robin Burchell [Sat, 23 Jun 2012 07:34:27 +0000 (09:34 +0200)]
Checking for QUrl equality is not all that expensive, so remove hack.
QUrl's operator== used to perform allocations by comparing normalized URLs, but
even then, this code seemingly would not apply: Qt 4's QUrl still has a fast
path for the case where the URLs are empty, the same as this code implemented.
Change-Id: I69e82c848f47f5e5660bd707bfba0ff7343c8a42
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Bea Lam [Mon, 25 Jun 2012 03:05:15 +0000 (13:05 +1000)]
Rename ListView *speed properties to *velocity
Change-Id: I63c02d186b1832e7bf890a00caad150d5bf136cb
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Andrew den Exter [Tue, 26 Jun 2012 03:13:11 +0000 (13:13 +1000)]
Fix section delegates not updating when changed.
Delete all allocated section items before doing an update when the
section delegate is changed.
Task-number: QTBUG-24899
Change-Id: I09dc7a1c602a49ad7bb37512a7e5116392259457
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Andrew den Exter [Mon, 25 Jun 2012 23:13:52 +0000 (09:13 +1000)]
Position section headers correctly when section property changes.
Schedule a new layout after the section property is changed to correct
item positions if section headers are added or removed.
Task-number: QTBUG-24900
Change-Id: I7e46ec6dc00e5a810029396a4c5ca4e87ee1d94d
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Bea Lam [Mon, 25 Jun 2012 06:47:38 +0000 (16:47 +1000)]
Isolate unstable test
Change-Id: Id534dc7ff7146799bdb989d8bcf56ca4c0fbeffa
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Andrew den Exter [Tue, 26 Jun 2012 00:00:06 +0000 (10:00 +1000)]
Fix crash in tst_qquicklistview.
Destroy the shared canvas before QGuiApplication is destroyed.
Task-number: QTBUG-26244
Change-Id: I9aa59bae5314f51c84a61821af2fb3c7a1c77941
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Glenn Watson [Mon, 25 Jun 2012 23:47:43 +0000 (09:47 +1000)]
Add warning if defining a ListModel with no roles.
When static ListElement types are declared, the role names are
inferred from them at compile time. If they are all empty, it's
not possible to add roles to the model, so warn the user of this
case.
Task-number: QTBUG-21438
Change-Id: Ib4ac30e160c44a5a57ebd1c49fccc2b3db5f0977
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Glenn Watson [Tue, 26 Jun 2012 00:01:39 +0000 (10:01 +1000)]
Remove default allocation size for PODVector.
The default increment was 1024, which can waste memory. Remove
the default value so that clients must explicitly set the allocation
increment.
The original bug is no longer relevant, as capture properties are
now stored in a linked list rather than a POD vector.
Task-number: QTBUG-20285
Change-Id: Iadb0b40af19fed36ccc05249461acc7e870dcbc3
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Robin Burchell [Mon, 18 Jun 2012 15:31:06 +0000 (17:31 +0200)]
Remove some unnecessary indirection.
There's no need to heap allocate our QQuickView, and there's no need to have a
seperate pointer to QWindow when we can just use the QQuickView directly.
Change-Id: Ia2bc83c9dc83d1df1ec793836793f752d67e9415
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Frederik Gladhorn [Sat, 23 Jun 2012 09:29:59 +0000 (11:29 +0200)]
Add mouse cursor shapes to MouseArea
This adds a new property that uses the enum
from the Qt namespace to allow setting of
custom cursor shapes for mouse areas.
Change-Id: I4d1ac6339b69dc9ea7855a8b8b6aa9276c71a90d
Reviewed-by: Jeremy Katz <jeremy.katz@nokia.com>
Casper van Donderen [Fri, 22 Jun 2012 08:51:44 +0000 (10:51 +0200)]
Doc: Use correct style and modules for doc build.
This change makes the "make docs" command use the correct style. Be aware
that the "global" qdocconfs need to be in the QT_INSTALL_DOCS location
before running "make docs", which effectively means that "make install"
needs to be run in qtbase when doing a prefix build.
Change-Id: Ib4635af0ad45717407a163968d629647898074dc
Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com>
Casper van Donderen [Fri, 22 Jun 2012 08:30:26 +0000 (10:30 +0200)]
Doc: Use the module "make docs" and rename qtquick "make docs".
The qtquick "make docs" is now renamed to "make qtquick_docs" and when
you use "make docs" you get the automatic make command generated by qmake
for modularized documentation.
Change-Id: I23c0e52fa9c235f76df430f992201723ddcfbbea
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Damian Jansen [Thu, 14 Jun 2012 06:19:02 +0000 (16:19 +1000)]
Remove superfluous statusChanged signal
If the file name is empty, or is a local file, statusChanged would be
emitted twice.
Task-number: QTBUG-26155
Change-Id: Id341d1c76d45e3fca19260293f632b0b51a34e90
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Bea Lam [Mon, 25 Jun 2012 01:30:01 +0000 (11:30 +1000)]
Revert "Remove properties related to highlight speed"
This reverts commit
18fb5506d524dbe380d5bf636c74c93fb85cbc31.
Without these properties there's no way to set a constant
movement speed.
Change-Id: I49cd648846f801eb479ecce8cde09ff49ea11736
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Alan Alpert [Tue, 8 May 2012 06:48:30 +0000 (16:48 +1000)]
Don't Assert
It's better to have run-time errors in certain uses of the property than
to assert when trying to access it.
Change-Id: I913eea3fe275ee41358ac8d56bd597faf8e613ad
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Reviewed-by: Andrew Stanley-Jones <andrew.stanley-jones@nokia.com>
Bea Lam [Mon, 25 Jun 2012 06:16:13 +0000 (16:16 +1000)]
Delete canvas created in test
This was causing a crash on exit.
Task-number: QTBUG-23605
Change-Id: I96a38f383a180f8aaf5177ad6d7183f9b0b5e85a
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Andrew den Exter [Tue, 19 Jun 2012 01:30:59 +0000 (11:30 +1000)]
Fix clicking on links in aligned or elided Text.
Adjust the mouse position to compensate for any alignment offsets
and test the elided text layout for anchors if none is found in
the normal layout.
Change-Id: Idfda3f7e372d0f2d6c1b7bb5f22d7015d52e8239
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Alan Alpert [Mon, 25 Jun 2012 03:54:12 +0000 (13:54 +1000)]
Link back to the particles module page from the overview page.
Task-number: QTBUG-25345
Change-Id: Id913bd1c1428b351bf03156891adaba5252ded5b
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Alan Alpert [Thu, 7 Jun 2012 03:23:56 +0000 (13:23 +1000)]
Delay custom emitter processing
It now happens after ParticlePainter intialization, so that custom
emitters can affect painter specific parameters like color.
Change-Id: I9a732713108580e57130588c175c69aa854c5b2f
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Matthew Vogt [Fri, 22 Jun 2012 06:28:40 +0000 (16:28 +1000)]
Correctly resolve qrc:/ URLs in type loading
URLS specified with the qrc scheme do not use the 'authority'
part of the syntax, and therefore do not necessarily contain a
double slash immediately after the scheme.
Task-number: QTBUG-25937
Change-Id: I49156b463f11dbb38d6a01d30ea934b0a652c8e5
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Martin Jones [Fri, 22 Jun 2012 06:56:27 +0000 (16:56 +1000)]
qmlRegisterRevision clashes with qmlRegisterUncreatableType
Add template<typename T, int metaObjectRevision>
qmlRegisterUncreatableType() in order to register an uncreatable type
for a particular revision.
Task-number: QTBUG-23278
Change-Id: Ic165e41c8176916929cf19eb9bf6eef4b5bee1eb
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Pekka Vuorela [Wed, 13 Jun 2012 11:51:00 +0000 (14:51 +0300)]
Fix right aligned cursor position in TextInput with geometry changes
Updating the text layout cannot be omitted with NoWrap because line width
needs to be updated even with empty content.
Change-Id: Ia9b168d6cfe7680cc1c9e7fa641ce7528d2b6d5e
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Matthew Vogt [Tue, 19 Jun 2012 00:24:01 +0000 (10:24 +1000)]
Decode directory separators in source URLs
URLs with encoded directory-separator characters are not correctly
processed by QUrl.
Task-number: QTBUG-25981
Change-Id: I78173ef44c4850774b56753335bea34db04c0735
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Thiago Macieira [Sun, 24 Jun 2012 22:11:00 +0000 (00:11 +0200)]
activeWindow is deprecated, use focusWindow.
Change-Id: I846d3121b7e17bcb07bc891e5a8ad9473439e5d9
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Tasuku Suzuki [Wed, 20 Jun 2012 01:31:52 +0000 (10:31 +0900)]
Make qtdeclarative compile with QT_NO_DRAGANDDROP
Change-Id: Ie92455495979b065b574f013d95fac17739fa40e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Jeremy Katz <jeremy.katz@nokia.com>
Thiago Macieira [Wed, 6 Jun 2012 17:17:42 +0000 (19:17 +0200)]
Fix compilation with GCC 4.7 (C++11)
The error was:
error: unable to find string literal operator ‘operator"" STR_PORT’
Change-Id: Id4b4e64e296ffc3624be15c20f74a964e6cd1087
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Andrew den Exter [Thu, 14 Jun 2012 05:11:54 +0000 (15:11 +1000)]
Fix crash when dragging items outside visible area.
If asynchronous item creation finishes while the content area of a
ListView has been dragged full outside the visible area a full refill
is triggered which can overwrite the requested index and potentially
result in a single delegate item being assigned to multiple view items
and later being doubly released. Only create the view item object in
the createItem function to prevent this from happening.
Secondly only reset the visible items if jumping outside the buffer
range rather than just the fill range to prevent churn when the list
only contains buffered items.
Task-number: QTBUG-26232
Change-Id: I5bce845898ef5f699f34afc268594ef38e01d6a3
Reviewed-by: Martin Jones <martin.jones@nokia.com>