Martin Petersson [Mon, 20 Feb 2012 13:56:12 +0000 (14:56 +0100)]
FolderListModel: remove widget and QDirModel use
FolderListModel used the obsolete QDirModel internally. Because of this
it needed widgets to work. I have made a threaded model instead that
use QDir internally.
Change-Id: Ibd1267a135ee3c6df7bcde420073866b7a76d0d1
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Kent Hansen [Tue, 7 Feb 2012 12:29:58 +0000 (13:29 +0100)]
QFastMetaBuilder: Generate revision 6 meta-objects
Support for old meta-object revisions (<= 6) will be dropped in Qt5.
The first, simple step towards revision 7 is to move from rev 4 to 6.
Also avoid copy/paste of the flags/types defined in qmetaobject_p.h
(in preparation of porting to revision 7).
Change-Id: I8ec3ad0811295528303abb5cce86011fc869ec30
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Alan Alpert [Tue, 28 Feb 2012 07:09:14 +0000 (17:09 +1000)]
Fix particle system on windows
To preserve correctness, just use a non-point-sprite performance level
on windows until QTBUG-24540 is resolved.
Change-Id: I7608fbe21233534fb22c9d352aafae759e68c143
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Martin Jones [Tue, 28 Feb 2012 06:49:17 +0000 (16:49 +1000)]
Make sure positioners remove change listeners for invisible items.
Children that are invisble weren't having their change listeners
removed, which showed illegal accesses on destruction in valgrind.
Change-Id: Icae798e773168323781e9ab88b3dae6a5aea0952
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Andrew den Exter [Thu, 23 Feb 2012 03:25:58 +0000 (13:25 +1000)]
Don't round Text dimensions.
Painting issues in QtQuick1 meant drawing had to be aligned to pixel
boundaries, since this is no longer a problem we should use qreal
everywhere.
Change-Id: I58e88e10270fa603170f1cedf471bfb53bd89b73
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Andrew den Exter [Wed, 22 Feb 2012 08:13:29 +0000 (18:13 +1000)]
Avoid unneccessary duplication of string data.
Check for the existence of new line characters before trying to replace
them. There's some redundancy if the characters are found but for
single line strings we avoid the detach in replace.
Change-Id: I48ccc614601a6f356b3d2e68f617e112c100bbdd
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Michael Brasser [Tue, 28 Feb 2012 03:03:30 +0000 (13:03 +1000)]
Add and use a method for querying whether a property is revisioned.
Accessor data and the revision are now unioned, so querying
the value directly can give incorrect results.
Change-Id: I0ba6c53d8bd6b012507bfb32d33dc414348379b0
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Bea Lam [Wed, 22 Feb 2012 07:23:47 +0000 (17:23 +1000)]
Add generic "displaced" transition property
This is the default displaced transition that will be applied if addDisplaced,
removeDisplaced or moveDisplaced are not specified (or are disabled).
Change-Id: I9356036dc93bd9cb26e64e0b1769228113b74273
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Stephen Kelly [Tue, 28 Feb 2012 10:15:03 +0000 (11:15 +0100)]
Add missing include
Change-Id: Ifb4b489bb87b7ee8fb2f758da0e00af1e95e410f
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Martin Jones [Tue, 28 Feb 2012 02:03:46 +0000 (12:03 +1000)]
Properly cleanup cancelled incubation.
Not all allocations were being destroyed.
Change-Id: I2134bb224c58b947cfb990b0af2f6eedfd36da4a
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Bea Lam [Tue, 21 Feb 2012 04:44:21 +0000 (14:44 +1000)]
Separate view transition functionality into new file
Move most of the view transition functionality from qquickitemview*
into qquickitemviewtransition*.
- Move QQuickViewTransitionAttached
- Move QQuickItemViewTransitionManager, rename to QQuickItemViewTransitionJob
- Move FxViewItem transition-specific features into new QQuickViewItem
- Move transition-specific functions like transitionNextReposition() and
canTransition() into QQuickItemViewTransitioner which holds all the
transition objects now
Also mention in docs that there's no defined order for choosing between
multiple matching displaced transitions.
Change-Id: I8701c0d40d2af152c5d432a4c8de646854c76ea2
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Alan Alpert [Tue, 28 Feb 2012 01:41:50 +0000 (11:41 +1000)]
Examples guidelines have changes slightly
Update docs to current thinking.
Change-Id: Ide00240f4d779549eebdc81592f3f2104dfd759a
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Alan Alpert [Tue, 28 Feb 2012 01:30:16 +0000 (11:30 +1000)]
Move some toys back to examples
tvtennis, corkboards and dynamicscene are more examples than demos.
clocks and tic-tac-toe are remaining demos for now.
Change-Id: I3d9501a4742349a9eb7efdad0d06aa6e7cb02c14
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Alan Alpert [Tue, 28 Feb 2012 01:33:51 +0000 (11:33 +1000)]
Update drag and drop examples to new guidelines
Change-Id: Ib09a50015eaf7e79f21ade5df3cbd3b58b89c83d
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Alan Alpert [Tue, 14 Feb 2012 08:16:21 +0000 (18:16 +1000)]
Rename SpriteImage to SpriteSequence
Also rename Sprite::frames->Sprite::frameCount
Change-Id: I2e7a71adc37044fd696ffda2a5da4835725ba3a8
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Alan Alpert [Mon, 13 Feb 2012 23:33:42 +0000 (09:33 +1000)]
Add AnimatedSprite
A simpler sprite image element for the simple usecase. Because sometimes
an engine with stochastic capabilities is overkill.
Change-Id: I2b76c5d417719e92a548f6266bffd563dc016983
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Jiang Jiang [Mon, 6 Feb 2012 13:05:58 +0000 (14:05 +0100)]
Move distance field util functions to QtGui
These distance field generation functions have been moved to QtGui.
Change-Id: I78d9015c8776717ede2d1299c2ef3787d165e0b9
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Chris Adams [Tue, 28 Feb 2012 04:04:38 +0000 (14:04 +1000)]
Fix crash in QDeclarativePixmapStore global static dtor
Due to the undefined ordering of global static dtors, the QDPS dtor
could run after the texture factories were deleted. Thus, the QDPS
dtor cannot call the cost() method of the pixmap data during its
destructor, as this could cause a crash.
Change-Id: I5d23066dc57e1992cf9d1c13d514f06c431bc752
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Martin Jones [Mon, 27 Feb 2012 05:54:16 +0000 (15:54 +1000)]
Incubators are not async with the threaded renderer.
The threaded incubator relies on the event loop spinning to signal
item updates. This change ensures that the event loop is processed
while items are being created and that the render loop is woken
if it is sleeping.
Also cancel delegate incubation correctly during destruction.
Change-Id: Ib5bb55c788411490e0959c75933da587fdfd4b8c
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Michael Brasser [Mon, 27 Feb 2012 23:48:27 +0000 (09:48 +1000)]
Correctly set duration and easing for AnchorAnimation.
Task-number: QTBUG-24532
Change-Id: I3aad9cd8281b954896c2c1d44b2dcae68f913928
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Alan Alpert [Fri, 24 Feb 2012 05:35:46 +0000 (15:35 +1000)]
Don't create unnecessary shadow data
Shadow data was being made by accident for uninitialized datums, because
they had not yet had the ImageParticle set as the datum owner.
Change-Id: Ia1d55610d845627cdb9c83bfda1d7ed4c024f703
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Alan Alpert [Sun, 26 Feb 2012 22:40:31 +0000 (08:40 +1000)]
Examples refactor rebase
Automatic rebase did not move some new files to where they should have
gone.
Change-Id: I25515d29d8992acde15db0df1bb5972e35573e60
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Alan Alpert [Mon, 27 Feb 2012 00:19:01 +0000 (10:19 +1000)]
Skip c++ examples in sgexamples test
They should be tested separately, QTBUG-24516 has been raised to
implement this.
Change-Id: Ic90bc8327e6c07164ed34b3d02f2612561491ec0
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Christiaan Janssen [Mon, 27 Feb 2012 12:01:03 +0000 (13:01 +0100)]
QmlProfiler: send v8 profiling started signal
Change-Id: Ie26bd47c9b79a7f524b9c5bc59146be1ea93761d
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Bea Lam [Mon, 27 Feb 2012 07:37:57 +0000 (17:37 +1000)]
Skip test case for now
Change-Id: I06128c544c1ee03d4528f6f86fc776e09be87316
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Charles Yin [Fri, 24 Feb 2012 03:33:59 +0000 (13:33 +1000)]
Force to send defer deletion events before deleting QQuickCanvas
Also change the assert in QDeclarativeEnginePrivate::~QDeclarativeEnginePrivate()
to a warning message.
Change-Id: Ic1fb7e0b7ffe4a54458a0f3a65127b1afd6dda53
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Matthew Vogt [Thu, 23 Feb 2012 01:49:26 +0000 (11:49 +1000)]
Create a forwarding declarative module.
The declarative module has been replaced by the qml module. To allow
existing projects which depend on the old declarative module to build,
add a new declarative module which forwards dependencies on to the
new qml module.
This module contains only redefinitions of old symbol names to their
new replacements, and creates forwarding headers that include the
replacement headers provided by the qml module.
This is a temporary change to prevent breaking existing projects
that depend on the declarative module. After clients have had an
opportunity to update their code to the use the new interfaces,
it can be removed.
Task-number: QTBUG-23737
Change-Id: I3cec5ceec4f9725c258e3672360a05ea87d3ca2f
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Martin Jones [Thu, 23 Feb 2012 06:57:06 +0000 (16:57 +1000)]
Don't create a separate section header for currentItem
The currentItem FxViewItem contained it's own section item,
which when created would cause the current item delegate
to be repositioned. This change associates the section item
with the delegate item, via the attached object.
Change-Id: Ie675d545539b56d0f1cf5a9b4ea26668978a5e72
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Chris Adams [Fri, 24 Feb 2012 04:40:11 +0000 (14:40 +1000)]
Check engine equality condition inside null ptr check
Previously, we asserted if the engine associated with the two external
resources from the arguments to the object comparison callback were
not equal, prior to checking that the external resources were non-null.
Task-number: QTBUG-24489
Change-Id: I4b2bd2377fcf38163d1341e43e056b1405ab72ac
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Chris Adams [Fri, 24 Feb 2012 06:14:12 +0000 (16:14 +1000)]
Ensure importing module API in js import works
This commit adds a unit test to ensure that a property of a module
api can be accessed in a JavaScript import.
Change-Id: Iecba76a9db0400ece1777256f19803d4bad53438
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Michael Brasser [Mon, 27 Feb 2012 01:08:15 +0000 (11:08 +1000)]
Improve test coverage for anchors.
Change-Id: I2705407b16ef678ed5b3cbfa7116ae6b18366688
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Bea Lam [Fri, 24 Feb 2012 08:05:35 +0000 (18:05 +1000)]
Stabilise tests
Change-Id: I2227fede52f5b0d59bd0dd9b10ab0151318d61dd
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Michael Brasser [Thu, 23 Feb 2012 00:12:52 +0000 (10:12 +1000)]
Remove unused member.
Change-Id: Ibfcc7a78e442c2be5bab6933e2e85ed39344e6c2
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
Michael Brasser [Thu, 23 Feb 2012 23:46:35 +0000 (09:46 +1000)]
Get script benchmark compiling and running.
Change-Id: Ifc433f6c430d430bfb8b2d8b47a84ad2688e4cb2
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Yuchen Deng [Wed, 15 Feb 2012 00:31:48 +0000 (08:31 +0800)]
Build fix when use '-no-stl' option
error C3861: 'toupper': identifier not found
error C2065: 'RAND_MAX' : undeclared identifier
error C3861: 'rand': identifier not found
error C2065: 'RAND_MAX' : undeclared identifier
error C3861: 'rand': identifier not found
Change-Id: Iaa0daf516c3d9f90d9119f958d79187ee2bb959c
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Aaron Kennedy [Fri, 24 Feb 2012 13:22:31 +0000 (13:22 +0000)]
Update license headers
Change-Id: Id47c6b26ee2ac2b3d30c464adaa55b7a7c3e4442
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Gunnar Sletta [Fri, 24 Feb 2012 11:23:51 +0000 (12:23 +0100)]
The plugin is cleaned up by the plugin loader so don't double-delete
Change-Id: I8bac5b6e1960cbc38575c76f02aa6c6c90700331
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Gunnar Sletta [Fri, 24 Feb 2012 06:28:54 +0000 (07:28 +0100)]
Revert resource releasing logic inside window managers.
This was based on the assumption that exposure and visibility
would take similar code paths, but this is not the case and
the fallout of this change (like not releasing resources at all)
is not worth it.
This reverts
ef6318ae38322b5a4a0619b581924290f114fa74 and most
of
5f0013ee76605b9c7ceab168702b57e797b698e0
Change-Id: Ib2e29972502a8ec956cd6bd294a2a2bb50d8e76e
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Alan Alpert [Mon, 20 Feb 2012 00:34:44 +0000 (10:34 +1000)]
Start of examples refactor
This is the general reorg of the examples directory structure, plus additional
guidelines.
calculator, animations and accessibility have been updated to the new standards
and tested, as an example.
Task-number: QTBUG-24133
Change-Id: I76c3b86751d3195ba2a5474ff23afb875765e9a4
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Michael Brasser [Fri, 24 Feb 2012 00:22:35 +0000 (10:22 +1000)]
Add additional autotests for signal handlers.
Change-Id: Ie94ce8b536347981310abeb077a88acedf44c7e6
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Aaron Kennedy [Thu, 23 Feb 2012 09:50:15 +0000 (09:50 +0000)]
Allow V8 bindings to assign to value type sub properties
This was an overly defensive change because it wasn't clear if the isAlias
check would catch aliased value type sub properties.
Change-Id: Iee2805d22f281c1fd188b14e265687fd8e7042db
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Matthew Vogt [Thu, 23 Feb 2012 23:23:08 +0000 (09:23 +1000)]
api_changes branch should build against qtBase/api_changes
Change-Id: I1f00f21cd5acc03e8b5020a5415db28bf127ad16
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Matthew Vogt [Thu, 16 Feb 2012 04:43:03 +0000 (14:43 +1000)]
Rename QDeclarative symbols to QQuick and QQml
Symbols beginning with QDeclarative are already exported
by the quick1 module.
Users can apply the bin/rename-qtdeclarative-symbols.sh
script to modify client code using the previous names of the
renamed symbols.
Task-number: QTBUG-23737
Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Andrew den Exter [Thu, 23 Feb 2012 04:11:48 +0000 (14:11 +1000)]
Use floating point types for position offsets and cursorRectangle.
Rounding to align painting to pixel boundaries is no longer necessary
are largely removed. Correct the few instances remaining in TextEdit
and TextInput.
Change-Id: Ic6ec57092d74ec43b23d85cd8868e0190acc3e09
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Stephen Kelly [Wed, 22 Feb 2012 23:34:32 +0000 (00:34 +0100)]
Remove use of QT_ASCII_CAST_WARN_CONSTRUCTOR.
Fixes build after I0b4df4c99600cacbaafbf0bc4270cd4978600956
Change-Id: I9cf326b52e0e7e267b8fbc422175713cee9352f5
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Roberto Raggi [Mon, 20 Feb 2012 13:46:26 +0000 (14:46 +0100)]
Fix rewrite of multiline string literals.
This commits ensures that we don't rewrite `\'-terminated
multiline string literals. Also, it fixes the processing
of \r characters inside the string literals.
Change-Id: If3d7c1b83c7306b9ccb1be31412b6f8e76434c41
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Aaron Kennedy [Thu, 23 Feb 2012 08:51:36 +0000 (08:51 +0000)]
Fix crash in instruction dump
Change-Id: I2cfa9da120a602b52f401dd304b44cd17c47b220
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Friedemann Kleint [Tue, 21 Feb 2012 09:55:34 +0000 (10:55 +0100)]
Use new plugin system in QtDeclarative.
- Use prefix "org.qt-project" for interfaces.
- Use new macros, add json files.
Change-Id: I53df83f95153c5c9c462098584606284470a5ae0
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Matthew Vogt [Thu, 23 Feb 2012 04:55:16 +0000 (14:55 +1000)]
Remove warning produced by 'parent' reference.
When Qt.createQmlObject is invoked from QML, any contained references
to parent produce a warning from V8. To prevent this, move the
assignment of the parent object to before the initial execution of the
bindings.
Task-number: QTBUG-24464
Change-Id: Ib330822f1ca46ec5a6af648a56197da09669c3f2
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Bea Lam [Thu, 23 Feb 2012 01:51:31 +0000 (11:51 +1000)]
Clean up some of the view transition docs
Fix some of the wording in the docs.
Change-Id: I07892bec06c78b73bdd93926719d609405e263b3
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Alex Wilson [Thu, 23 Feb 2012 01:57:18 +0000 (11:57 +1000)]
Fix for bad operator precedence causing right mouse button issues
Binary or (|) has higher operator precedence than a ternary in C,
causing the original expression here to function quite incorrectly
for anything other than the common left-mouse-button-only case. I
just added brackets -- feel free to change this to "if"s if you
think that would more clearly avoid this issue in future.
Change-Id: Ie20bd7e805b89a393794d3240fb0ae680b29ff64
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Andrew den Exter [Fri, 17 Feb 2012 02:26:21 +0000 (12:26 +1000)]
Fix Text eliding with implicit height and maximumLineCount.
Ignore the height of the text if the element height is invalid.
Task-number: QTBUG-24293
Change-Id: I1646c3f64583da40e6166aeea24c2c4af42cb279
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Martin Jones [Thu, 23 Feb 2012 01:58:23 +0000 (11:58 +1000)]
QML locale.firstDayOfWeek returns 7 for Sunday
To match JS Date object, Sunday should be 0.
Change-Id: I662c0b1fcbf921fa1c4bb58f900366dd088b343b
Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
Michael Brasser [Thu, 23 Feb 2012 01:08:58 +0000 (11:08 +1000)]
Small doc fixes.
Change-Id: I54ed2d0387b85ac853d94cfe716a1f6016986e2a
Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
Yann Bodson [Tue, 21 Feb 2012 04:11:04 +0000 (14:11 +1000)]
Fix font size calculation in headings in StyledText.
Calculate the font size correctly even when the size is specified
in pixels and update this size when the font changes.
Also make sure that the text layout's font is set before parsing.
Task-number: QTBUG-24458
Change-Id: Ida7723f6e4f4b9fd3a6878076f4beaf5bda8f7f7
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Andrew den Exter [Tue, 21 Feb 2012 03:31:19 +0000 (13:31 +1000)]
Reduce QQuickTextEdit memory usage.
Remove unnecessary members from QQuickTextEditPrivate and
QQuickTextControlPrivate and re-order and pack to reduce padding for
alignment.
Change-Id: I14f5e3fc01646d02745f095c2a4b168cd675745d
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Michael Brasser [Wed, 22 Feb 2012 00:15:41 +0000 (10:15 +1000)]
QML_RUNTIME_TESTING should be disabled by default.
Change-Id: I67e0dae6f21162b962c1ce4454dc3d82e4e40049
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Michael Brasser [Wed, 22 Feb 2012 05:00:44 +0000 (15:00 +1000)]
Update number of reserved bits.
Change-Id: I38e112c2493abd9ec79b97e6e28334a3ba66543c
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Martin Jones [Wed, 22 Feb 2012 03:16:28 +0000 (13:16 +1000)]
Remove the last sql dependency in declarative
Change-Id: Ib2410e1b32e2cc5216d5fc9659bc45fb46a1da61
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Oswald Buddenhagen [Tue, 21 Feb 2012 15:17:16 +0000 (16:17 +0100)]
clean up qmake-generated project
remove "header" and assignmets which are defaults or bogus
Change-Id: I1d777f5418b0f353bf276a979c6300a941927e7e
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Aurindam Jana [Wed, 22 Feb 2012 13:27:18 +0000 (14:27 +0100)]
DebugMessageService: Remove unneeded data
Do not send version info of QMessageLogContext.
Change-Id: I32dd4a548ee2b918e5d04dcdffd4d5545fd2f54f
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Caroline Chao [Thu, 16 Feb 2012 11:18:43 +0000 (12:18 +0100)]
CodeCoverage: Fixes regression.
Fixes segmentation fault introduced by qtbase change:
36f5cc848de2525
Coverage data are now saved in QTestLog::stopLogging. Also the current
application name needs to be set for a quick test as well.
Remove also code coverage call to installCodeCoverage from quicktest
due to refactor of the code coverage setup in qtestlib. This should be less
error-prone. See qtbase change:
949b7452e0d2402
Change-Id: I13566cc43dfb3af264d3b2be2e5f2617128f4801
Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
Alan Alpert [Wed, 22 Feb 2012 02:16:50 +0000 (12:16 +1000)]
Positioners cleanup
Use qreal for positions and spacing instead of ints, and make the
positionedItems list take care of filtering out invisible items.
Change-Id: Icad93ad89c848e40a70bd7a9539bd810e27020df
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Matthew Vogt [Wed, 22 Feb 2012 06:12:26 +0000 (16:12 +1000)]
Add test verifying that QObject-derived pointer is passed correctly.
Ensure that an object derived from QObject is correctly passed to
an invokable function from QML.
Change-Id: I71eefe8c480e1f1574804d05244b53f29c7fbf0d
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Bea Lam [Tue, 21 Feb 2012 07:47:10 +0000 (17:47 +1000)]
Doc improvements for positioners
- Fix docs that say opacity changes can trigger an add transition since
this is no longer the case
- Be more clear about when the move transition is applied
- Be more clear about which anchors are allowed/disallowed in which positioners
- Add example to Positioner attached property
Change-Id: I78417ac5b8eba1af5587955121b7fd4e2ca21169
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Alan Alpert [Wed, 22 Feb 2012 02:18:11 +0000 (12:18 +1000)]
Whitespace fixes for positioners
Change-Id: I53a8a023e218cd41b2c01a7c931c95edfbaee780
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Andrew den Exter [Mon, 20 Feb 2012 07:18:20 +0000 (17:18 +1000)]
Reduce the size of QQuickTextInputPrivate.
Remove some redundant or obsolete member and reorder members to
minimise padding for alignment.
Change-Id: I2660007baa07bea076e9ad307061af87c07e37cf
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Martin Jones [Fri, 17 Feb 2012 03:08:21 +0000 (13:08 +1000)]
Implement String.localeCompare() using QString::localeAwareCompare()
v8's localeCompare() implementation is not locale aware, so we use
Qt's locale aware compare.
Change-Id: Ia9092b3d6754545bb797adac26080ac7a29dcd92
Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
Aurindam Jana [Tue, 21 Feb 2012 13:56:24 +0000 (14:56 +0100)]
DebugMessageService: Also pass Debug Context Info
Use QMessageHandler which provides context information such
as line, file and function for the debug output.
Change-Id: I475faf4a1363d8419dec910b8a23cc44666c1908
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Kai Koehne [Fri, 17 Feb 2012 14:56:14 +0000 (15:56 +0100)]
v8profiler: Actually submit data
Fix regression introduced in
82dfecab3.
Change-Id: Icd90c483b9b2fde8d4cf522f3a35368cd395b120
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Aaron Kennedy [Mon, 13 Feb 2012 14:42:34 +0000 (14:42 +0000)]
Reduce size of QQuickItemPrivate
Change-Id: I02653536f68cfef3dfc06acaf30e2565a97dc194
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Gunnar Sletta [Tue, 21 Feb 2012 06:23:42 +0000 (07:23 +0100)]
Release resources on shutdown..
Change-Id: I7758f5ba1f58e19d92e394133cccd449ce5a1756
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Martin Jones [Thu, 16 Feb 2012 05:54:09 +0000 (15:54 +1000)]
Flicking a pathview with large delegate spacing is inconsistent
The deceleration is inconsistent and dragging slowly is jerky.
This was largely due to the poor resolution of the path points.
pointAt() now interpolates, and the dragging logic is more
accurate. Also removed the rounding of item positioning so
that side-by-side items don't bounce around.
Task-number: QTBUG-24312
Change-Id: I956aff0b83c3c1211d5657159c3de1e4ef0b5171
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Charles Yin [Mon, 20 Feb 2012 00:07:08 +0000 (10:07 +1000)]
fix typo error in documentation
Change-Id: Ic3706b0920b8a50f994e0627bda6baf0fd04b81c
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Charles Yin [Tue, 21 Feb 2012 01:06:57 +0000 (11:06 +1000)]
Renames QAnimation2ChangeListener to QAnimationJobChangeListener
Change-Id: I921b252380d095fb878b4e5d36df0b5a13a3888f
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Charles Yin [Tue, 21 Feb 2012 02:39:07 +0000 (12:39 +1000)]
Remove sql dependency from declarative.pro
Change-Id: I43aa11e948a498796788587e03a699f121308d1b
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Bea Lam [Tue, 14 Feb 2012 02:19:30 +0000 (12:19 +1000)]
Stabilise ListView and GridView tests
Some tests need to wait for view to be updated before proceeding. This ensures
a polish is received before proceeding
- before checking through child items after initial load
- after changing content y
unless some other QTRY_* is already doing the job.
Also fixed some tests that randomly failed for other reasons.
Task-number: QTBUG-22872 QTBUG-23605
Change-Id: I2d41bf09fae09b90fd3aadbd5349e991c3339761
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Bea Lam [Mon, 20 Feb 2012 23:19:54 +0000 (09:19 +1000)]
Fix condition check against wrong variable
Change-Id: I0857166e666e886077e4b0eda2d8b00b13f99ba6
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Bea Lam [Tue, 21 Feb 2012 00:09:02 +0000 (10:09 +1000)]
Skip tst_QQuickListView::sectionsDelegate() for now
Failing occasionally
Change-Id: I74fdc7f0d71a92ef2ea19df3125a362e2fa199c5
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Andrew den Exter [Mon, 20 Feb 2012 05:22:37 +0000 (15:22 +1000)]
Reduce the size of QTextPrivate.
Remove some unnecessary members, store colors as QRgb values instead
of QColor, and reorder members to minimise alignment padding.
Change-Id: Id3958429008c97a5714734a529250fe881e2161b
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Jędrzej Nowacki [Thu, 9 Feb 2012 09:19:26 +0000 (10:19 +0100)]
Add optimizations for QJSValue tests for MSVC.
The comment is not valid. It was added for QScriptValue generated test
which are not included in QJSValue tests.
Change-Id: I958e3c1d1f57cfa0ad34d1a8c8387deec792efaf
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Martin Jones [Mon, 20 Feb 2012 03:59:41 +0000 (13:59 +1000)]
cacheBuffer makes delegates appear briefly in wrong position
Set delegates that are created asynchronously to non-visible. This
would have happened the next time addVisibleItems() was called.
Task-number: QTBUG-24364
Change-Id: I4b628bef186c8c41bd6a4d9e4ac402d59bcb4972
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Justin McPherson [Fri, 17 Feb 2012 03:52:09 +0000 (13:52 +1000)]
Remove the callback facility from context node.
- It's not really necessary.
- It's probably a mis-use of QSGNode::preprocess()
- Because it triggers a race between object deletion in the main thread
and preprocess() in the render thread.
Change-Id: I51433f508db306aab53398f8c3d1d8c9d9e986fd
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Aurindam Jana [Fri, 17 Feb 2012 10:09:31 +0000 (11:09 +0100)]
DeclarativeEngineDebugService: Fix Crash
Iterate through contents of QVariantMap to convert
QObjects to streamable type.
Change-Id: I2cb64a84aef674904de43f9a0c0fee539b87a59a
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Friedemann Kleint [Mon, 20 Feb 2012 16:05:26 +0000 (17:05 +0100)]
Fix gcc compiler warnings.
Change-Id: I22d0a45bdcf68c454af0aab9fa62dd2d126d63c2
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Michael Brasser [Mon, 20 Feb 2012 22:58:59 +0000 (08:58 +1000)]
Make compile.
Fix compile after
054114a459580b71e170dc6bf356e8943d0ed068 in qtbase.
Change-Id: Ibeea6b4b2e3c5f420446b15edd1df7bf88535dcd
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Aaron Kennedy [Mon, 20 Feb 2012 16:40:13 +0000 (16:40 +0000)]
Remove commit headers
These were used when we were porting from QtQuick 1 to QtQuick 2 but
are no longer necessary.
Change-Id: I0eeb7e13b4affdd6ab6c6dddea760afcdf38ee4f
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Kai Koehne [Mon, 13 Feb 2012 13:35:21 +0000 (14:35 +0100)]
Console API: Pass context information from js to qt logging framework
Log the file, line, function context from the original calls in js.
Also print the stack trace as part of one multi-line message.
Change-Id: I53836df081f3ce06e9b52ebb647ba172ff6bdbef
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Aurindam Jana [Thu, 9 Feb 2012 16:04:43 +0000 (17:04 +0100)]
QmlProfilerTool: add tool to QDeclarative
qmlprofiler is a standalone tool used to record
profiling data of QML apps. The data is stored
in a file which can be loaded in QtCreator for
investigation.
Change-Id: I308f4c40bc3876933bd0d32c336cef6cd6f5fb4a
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Aaron Kennedy [Fri, 17 Feb 2012 10:52:37 +0000 (10:52 +0000)]
Delete v8methods array at destruction
Change-Id: I6412ad352ad23db4100fffc9285532eb7e0b3a71
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Aaron Kennedy [Thu, 16 Feb 2012 16:53:55 +0000 (16:53 +0000)]
Don't store source after script data is created
Change-Id: I84fd61893db3578b80beb85b9a88ed325ea7584f
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Aaron Kennedy [Thu, 16 Feb 2012 14:10:12 +0000 (14:10 +0000)]
Reduce memory by not calling QUrl::toString() multiple times
Change-Id: I57ce25f4e20cac048ff507a8c195b83adc30040d
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Aaron Kennedy [Fri, 10 Feb 2012 12:57:57 +0000 (12:57 +0000)]
Don't store object and property in QDeclarativeAbstractBinding
Change-Id: Ia164655f6329ec80dc466a1a3a5613a73e1c23ac
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Aaron Kennedy [Tue, 14 Feb 2012 13:55:29 +0000 (13:55 +0000)]
Reduce size of QV8Bindings
Change-Id: I4bd8fed3f38aa358fb42e21b5cf19ff1aa61c138
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Aaron Kennedy [Tue, 14 Feb 2012 13:10:29 +0000 (13:10 +0000)]
Reduce size of QDeclarativeJavaScriptExpression
Change-Id: Ie1242d18ef10e5cbd9c1cab27c31ad3f6d9281fd
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Aaron Kennedy [Tue, 14 Feb 2012 12:54:30 +0000 (12:54 +0000)]
Reduce size of QV8Bindings::Binding
Use the instruction ptr instead of copying data
Change-Id: I2e9c8ce2fcf5d664ac98d8d58b5733b60e8bf548
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Aaron Kennedy [Tue, 14 Feb 2012 12:43:43 +0000 (12:43 +0000)]
Reduce the size of QDeclarativeAbstractBinding
The weak pointer in every binding is rarely used, so we can store it in
the same memory as the me ptr.
Change-Id: I3ce7d767fa25cf5b6e6d30c4f022d0e94fc3ffbb
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Aaron Kennedy [Tue, 14 Feb 2012 12:13:51 +0000 (12:13 +0000)]
Reduce the size of QDeclarative*Expression
Reduces the size of QDeclarativeAbstractExpression and
QDeclarativeJavaScriptExpression.
Change-Id: I39386e5a45f8bd12bfb2d80b47dfec37f2f05479
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Aaron Kennedy [Tue, 14 Feb 2012 11:20:32 +0000 (11:20 +0000)]
Update ftw classes
This is for the benefit of subsequent changes.
Change-Id: Ib494efb1474d069c067194008c9832653d5d8eb4
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
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>