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>
Thiago Macieira [Tue, 19 Jun 2012 10:12:32 +0000 (12:12 +0200)]
Fix build: include the necessary headers properly.
qstrcmp is defined in qbytearray.h
If QObject needs to be forward declared, then so does QMetaObject.
Change-Id: I9dd3ad59ce889cee04583ead27fa760d784e5b84
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Girish Ramakrishnan [Fri, 22 Jun 2012 03:05:16 +0000 (05:05 +0200)]
Make qmltest depend on gui-private
QWindowSystemInterface will shortly be marked as QPA API.
(quicktestevent.cpp pulls in qtestkeyboard.h which uses that
class)
Change-Id: Id7bd03e8a97be6bf4677c8a326191b3df2675824
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Girish Ramakrishnan [Fri, 22 Jun 2012 07:45:53 +0000 (09:45 +0200)]
Add gui-private to tests
QWindowSystemInterface will be marked as QPA API.
Change-Id: Id174a24f8432219adf1425efe1eb59cf67d48bb9
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Kent Hansen [Mon, 4 Jun 2012 14:10:34 +0000 (16:10 +0200)]
Pass the right signal index in visualadaptormodel proxy meta-object
For QMetaObject::activate(), the index must be relative to the
class's own signals (excluding non-signal methods).
For QMetaObjectBuilder, the notifier index must be relative to the
class's own methods.
Change-Id: I22f55d1fc55d56c997135dc78f51b710b37bb01a
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Andrew den Exter [Fri, 22 Jun 2012 00:03:20 +0000 (10:03 +1000)]
Remove insignificant_test from DropArea test.
The test has not been failing on recent CI runs.
Task-number: QTBUG-24588
Change-Id: I9dd29bbf1a33d9fbf042693a0995dafd887c3064
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Andrew den Exter [Fri, 22 Jun 2012 06:00:08 +0000 (16:00 +1000)]
Remove the open and closeSofwareInputPanel functions.
Functionality is provided by the global Qt.application.inputMethod
object.
Task-number: QTBUG-21449
Change-Id: I75c082bcbe44c8834ccaf966a3f9a09ab91ec290
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Alan Alpert [Fri, 22 Jun 2012 01:51:37 +0000 (11:51 +1000)]
Remove stale demos
Focus for Qt5 is fewer, better demos.
Change-Id: Ia2b74ce4768034d8f225547ffbbc85ac5cb72845
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
root [Fri, 22 Jun 2012 02:48:32 +0000 (12:48 +1000)]
Install examples to example hierarchy
Some examples were installing to an old path of qtdeclarative/qtquick
Task-number QTBUG-26205
Change-Id: I6e1840b1f1a87e24c1728de1b7320d6738bd530e
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Bea Lam [Fri, 22 Jun 2012 01:39:18 +0000 (11:39 +1000)]
Rename Flickable x/yOrigin to originX/Y
This is consistent with the naming of other x/y properties, e.g.
contentX/Y, relativeX/Y etc.
Change-Id: I5159f8e54a6fda6a1f83a563ea9db47c3b8af238
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Bea Lam [Wed, 20 Jun 2012 07:08:56 +0000 (17:08 +1000)]
Remove properties related to highlight speed
ListView should only have duration-type properties (i.e.
highlightMoveDuration and highlightResizeDuration) as it's unnecessary
to have both duration and speed properties for the highlight animation.
(PathView and GridView only have the duration-related properties.)
Change-Id: I1b94599e3e89afe6488ce2a882c2802354a859fe
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Martin Jones [Wed, 13 Jun 2012 03:40:21 +0000 (13:40 +1000)]
Add some tests for literal parsing
Change-Id: I3f3047cf27b1e5d230db0ed4154bac09e6adf087
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Michael Brasser [Thu, 21 Jun 2012 23:23:26 +0000 (09:23 +1000)]
Handle enum values of -1 correctly.
This was already handled correctly most places; now the
remaining cases (using an enum in ListModel, and assigning
an enum to an integer property) should also work correctly.
Task-number: QTBUG-21679
Change-Id: Ibff13f0b94da94b18e2e3bae4aa6ba44e0fa944b
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Michael Brasser [Fri, 22 Jun 2012 01:36:11 +0000 (11:36 +1000)]
Clarify anchor error messages.
Task-number: QTBUG-24625
Change-Id: Icff9fe16f053f7e79039ef31bb56cae00cdf49d1
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Andrew den Exter [Thu, 21 Jun 2012 05:49:10 +0000 (15:49 +1000)]
Add tests for clicking and dragging with right and middle buttons.
Task-number: QTBUG-24461
Change-Id: I2c8b3455cb3aead5df7dfd85f65eb633a552b881
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Andrew den Exter [Thu, 21 Jun 2012 07:01:14 +0000 (17:01 +1000)]
Don't shadow member variable with argument.
Function argument is being written to itself rather than the member
variable preventing the property from ever changing.
Task-number: QTBUG-26158
Change-Id: Id204a193300c62feeb007a2ea9df89cba5e1d513
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Andrew den Exter [Thu, 21 Jun 2012 00:07:56 +0000 (10:07 +1000)]
Fix crash when selecting transformed text.
QSGClipNode cannot be used directly, a sub-class or external provider
of geometry is required.
Task-number: QTBUG-26234
Change-Id: I0354ec17b619886b95f7994ad5af5c96e97397a0
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Martin Jones [Wed, 20 Jun 2012 05:57:49 +0000 (15:57 +1000)]
dynamiclist example used different delegate height for anim and static
so delegates added later weren't the same size as the original items.
Set a better value for both.
Task-number: QTBUG-26206
Change-Id: Ic9d32528eb43a77e23e3a619834da098f177b5d6
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
Martin Jones [Tue, 19 Jun 2012 06:18:16 +0000 (16:18 +1000)]
Fix snake demo.
A surrounding Item {} appeared for no clear reason.
Task-number: QTBUG-26198
Change-Id: I1ddb7cc92c5ba977d85d3047c405a90cfe697a13
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Glenn Watson [Wed, 20 Jun 2012 02:57:43 +0000 (12:57 +1000)]
Fix locale test on Linux and skip it on Windows.
The timezone that V8 internally uses was not being updated at the
end of one test, causing failures in subsequent tests. This was
only showing up on Windows because the test was being skipped on
Linux due to a typo. Skip the test on Windows due to complexity
of changing the timezone (added comments in code with details).
Change-Id: I47c8542111e8ddfbdeff39815c50d98570b0c6c2
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
Matthew Vogt [Mon, 18 Jun 2012 05:06:16 +0000 (15:06 +1000)]
Support enum return types in Q_INVOKABLE functions.
Handle enums correctly when used as the return type of a Q_INVOKABLE
function.
Task-number: QTBUG-23543
Change-Id: I14a506ffee08f5ba6aa0fdf27d6104a3ae5c48b3
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Matthew Vogt [Tue, 19 Jun 2012 02:57:57 +0000 (12:57 +1000)]
Report clashing qmldir entries for components and scripts
If a qmldir contains multiple lines that install the same versioned
property for a single component name or script qualifier, report an
error rather than silently suppress one entry.
Task-number: QTBUG-25834
Change-Id: I25d3a24102a5a4fa3d82f1d31d7e52505026fff7
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Chris Adams [Mon, 28 May 2012 07:12:56 +0000 (17:12 +1000)]
Create new documentation structure
The documentation currently has no clear separation between Qt QML
and Qt Quick. With recent commits like:
6c8378eaf1edbbefe6aaa3672b0127816a004fd7
and
ab1e510121c8a679fdaca12ccd30e0f7ac12a26b
the separation between the language definition and implementation,
provided by Qt QML, and the standard library for the QML language,
provided by Qt Quick, is clear.
This commit creates a new documentation structure that is more
navigable and separates concepts into logical categories, with
clear separation between QtQML and QtQuick. It also provides a more
generic QML Application Developer Resources page which contains links
to information for QML application developers.
Change-Id: Ia807ccfbfd24ffa0e1c7f0a51ed9d2ed3aa6a733
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Chris Adams [Wed, 23 May 2012 08:05:10 +0000 (18:05 +1000)]
Put basic language types into QtQml import
This import is automatically registered by the engine.
It provides basic language types (Component and QtObject).
Note that the QtQuick import still has these types registered into it,
so this commit doesn't break existing code.
Change-Id: I8ff190f057fc92969020cf8e896da1649ca3069b
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Chris Adams [Thu, 21 Jun 2012 07:21:07 +0000 (17:21 +1000)]
Fix crash in QQuickPixmapData::release()
Previously, if the reader was deleted (eg, via engine destruction)
the reply might be deleted without letting the associated
QQuickPixmapData know about it. If that data was later released,
it would attempt to write to previously freed memory.
This commit ensures that the data's reply ptr is set to zero when
the reply is deleted by the reader dtor. It also adds a comment to
the reply dtor to explain why it is important.
A unit test for this issue already exists:
tst_qquickpixmapcache::lockingCrash() run under valgrind.
Change-Id: Icd94528e1336db1c00b118b3f6d1222eef402c46
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Chris Adams [Thu, 21 Jun 2012 06:02:38 +0000 (16:02 +1000)]
Disallow signal-handler-specification for non-signal methods
Previously, the code which checked whether a signal handler
specification was valid was incorrect, in that it only checked that a
method of the appropriate name existed (rather than specifically a
signal method).
This commit ensures that the appropriate code is updated to check the
method for signal-ness.
Task-number: QTBUG-26223
Change-Id: I306f6622aaa710d86c01d5bbc5146eecce7cf2c3
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Michael Brasser [Thu, 14 Jun 2012 00:18:45 +0000 (10:18 +1000)]
Enable literal Qt enum assignment to enum properties.
Assigning Qt global enums to enum properties was previously handled as
a binding, rather than a literal assignment.
Change-Id: If6bb65f63b34f4e10c0636221ddadb11f7025735
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Friedemann Kleint [Wed, 13 Jun 2012 10:10:18 +0000 (12:10 +0200)]
Fix warnings in declarative tests.
- Unused variables and test data.
- () around operator &&.
- Conversion of false to 0-pointer where QVariant was intended.
- Missing enumeration value.
- Remove duplicated qqmlecmascript entry from qml.pro
(has an internal check for no-widgets).
Change-Id: Ie030167e22bce26e3988a4406c630fb460f61a3c
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Friedemann Kleint [Wed, 13 Jun 2012 10:09:15 +0000 (12:09 +0200)]
QtQuick: Fix warnings about deprecated QWeakPointer usage.
Use QPointer for QObject-derived classes.
Change-Id: Ia7be2354b8b3bbce04316185f49a80e76057a18b
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Friedemann Kleint [Wed, 20 Jun 2012 12:44:35 +0000 (14:44 +0200)]
Mark tst_qquicklistview insignificant for Mac.
Task-number: QTBUG-26244
Change-Id: I314fa5293ffaa72dafa843d1a950d0abed5a4516
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Alan Alpert [Mon, 18 Jun 2012 04:08:55 +0000 (14:08 +1000)]
Cleanup SG properly in QQuickCanvas
The scenegraph renderer and root node were not cleaned up when all other
SG nodes are. This leads to a possible case where the SG nodes
regenerate for the canvas without being properly linked to the renderer.
Task-number: QTBUG-23571
Change-Id: I19084af998cb7482bfddc87770ee9b5e0aad3a6c
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Andrew den Exter [Wed, 20 Jun 2012 04:11:02 +0000 (14:11 +1000)]
Fix binding errors in cppextensions examples.
Import QtQuick 2.0 for value type support in the examples which use
QColor.
Task-number: QTBUG-26207
Change-Id: I1a477f7b9ff90862d64e2d5545171728c6f97aaa
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Andrew den Exter [Wed, 20 Jun 2012 00:13:29 +0000 (10:13 +1000)]
Give the example Loader in the shared launcher focus.
Allows an example to receive focus the same as if it were the root item
in a scene.
Change-Id: Iedd31236db50ba985aebe3bd82a5af8803dc0f17
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Andrew den Exter [Tue, 19 Jun 2012 07:25:26 +0000 (17:25 +1000)]
Fix missing content in installed calculator demo.
Add the content directory to the project installs.
Task-number: QTBUG-26203
Change-Id: I08b79534f522024b289724ebaba206715b8bfbea
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
Andrew den Exter [Tue, 19 Jun 2012 07:06:22 +0000 (17:06 +1000)]
Resolve example qml file paths relative to the executable path.
Task-number: QTBUG-26202
Change-Id: I0ef9d2aa2248c8ddfd61afcd8bca731325f8d239
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Andrew den Exter [Tue, 19 Jun 2012 06:53:15 +0000 (16:53 +1000)]
Fix compile of Same Game demo.
Task-number: QTBUG-26204
Change-Id: I79059969033c57f82437bbec4e4323bfa0cc9430
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>