Chris Adams [Fri, 6 Jul 2012 06:36:11 +0000 (16:36 +1000)]
Include QQmlExpression in QtQml module CppClasses docs
This commit just adds the structure and the topic page entry.
The actual content for the in-depth page has yet to be written.
Change-Id: Iee083fe091c612d235bffb64ca38a8e06cc3b9e4
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Alan Alpert [Fri, 6 Jul 2012 06:23:30 +0000 (16:23 +1000)]
Add maroon demo
Change-Id: I880edf78e210d243ef87511e88ea592f6e252da6
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Alan Alpert [Thu, 5 Jul 2012 01:45:28 +0000 (11:45 +1000)]
Add new samegame and calculator demos
Change-Id: I06ac38a1d0f844eba367fc5e163151d1f70a0012
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Andrew den Exter [Tue, 10 Jul 2012 00:17:52 +0000 (10:17 +1000)]
Re-enable commented out tests.
The dependent task has now been resolved.
Change-Id: I6880b9c9240ffdbab6f39845ce700aab4c774f6f
Reviewed-by: Damian Jansen <damian.jansen@nokia.com>
Andrew den Exter [Tue, 10 Jul 2012 05:29:58 +0000 (15:29 +1000)]
Re-enable tests dependent on QStandardItemModel.
These were disabled when QtWidgets was not available, but that is no
longer necessary following QStandardItemModel being moved to QtGui.
Change-Id: I7ed133d9fd5ae6daa5ed9df180f7745fc3f368b1
Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
Reviewed-by: Damian Jansen <damian.jansen@nokia.com>
Chris Adams [Thu, 12 Jul 2012 02:00:22 +0000 (12:00 +1000)]
Enable tst_qqmlpropertycache
Due to the lazy metaobject initialization change, the property cache's
append method is now private. Instead, it offers a copyAndAppend
method which the test should use.
Change-Id: I1279eb997832244593aa11d5644d14b31ea68dd2
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Thiago Macieira [Tue, 17 Jan 2012 13:37:27 +0000 (11:37 -0200)]
Update the export macros in qtdeclarative.git
Use the new, simpler QT_STATIC macro.
Change-Id: I86d9d1a0e2812896594bfb0e6945b194f896d775
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Thiago Macieira [Tue, 29 May 2012 16:52:01 +0000 (18:52 +0200)]
Change CONFIG += staticlib to CONFIG += static
That's the targetted, correct way of defining a static library.
Change-Id: Ib039e1872c190900c3c7ef1f2d2c4ca03743852c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Oswald Buddenhagen [Mon, 9 Jul 2012 16:49:37 +0000 (18:49 +0200)]
use centralized qml plugin project handling
Change-Id: I27b773b042560d3a95d943ad942e84d9aaeeba40
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Oswald Buddenhagen [Mon, 9 Jul 2012 14:25:41 +0000 (16:25 +0200)]
"export" the qml tools for qtPrepareTool() use
notably, this disables the build of qmlplugindumpd.exe under windows -
it is not clear to me why somebody would want to do that, as both sets
of libraries would be available, and the output from both variants should
be the same.
Change-Id: I95c77b2aa32f17f9d6df0e5d4b9d11f456d860f6
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Michael Brasser [Fri, 6 Jul 2012 01:43:41 +0000 (11:43 +1000)]
Fix, test and document animation started/stopped signals.
Rename completed to stopped (as it is not only emitted
on completion). Ensure that the started and stopped signals
are emitted at the right times. Document the signals.
Task-number: QTBUG-14968
Change-Id: Icd3babcef2c9e544476592a26e6b9e58a21ebe95
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Michael Brasser [Mon, 9 Jul 2012 02:13:05 +0000 (12:13 +1000)]
Add documentation for all font properties.
Change-Id: I575fb6f25a0c926a713b1aa266a2c7ca24368c3e
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Martin Jones [Tue, 10 Jul 2012 06:40:06 +0000 (16:40 +1000)]
pressed and pressedButtons don't work when multiple buttons are pressed
The pressed property would react to any mouse event, regardless of
whether it was in acceptedButtons, or there were other buttons still
pressed. It will now remain true while any button in acceptedButtons
is pressed.
The pressedButtons property could contain buttons not in the
acceptedButtons mask. It will now only contain buttons that are in the
acceptedButtons mask.
Task-number: QTBUG-26458
Change-Id: I6b25cc36a58c113de062d530761dc179d7ef4a5a
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Matthew Vogt [Thu, 5 Jul 2012 06:09:27 +0000 (16:09 +1000)]
Allow color to be explicitly compared to a string
Add the Qt.colorEqual() function which compares any combination of
two supplied color and string arguments, by converting the string
arguments to colors as necessary.
Task-number: QTBUG-18754
Change-Id: I75baef9a2edd30a5f8b9cb5e151e4adba6f6a371
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Bea Lam [Thu, 5 Jul 2012 02:29:24 +0000 (12:29 +1000)]
Merge old "Modules" docs into new doc structure
This removes modules/todo.qdoc which contained the old "Modules"
documentation page and merges this content into the new Modules
documentation.
Also cleaned up the structure of the "qmldir" docs.
Task-number: QTBUG-26378
Change-Id: Idc8800d0595647eb7064ecadc5a00254341ed1e8
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Andrew den Exter [Tue, 10 Jul 2012 05:14:33 +0000 (15:14 +1000)]
Use QQuickTextUtil to calculate alignment offsets in TextInput.
Change-Id: I8602f949c01cb4c5a3b05de5a2800dead0ae8b47
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Andrew den Exter [Mon, 9 Jul 2012 06:33:21 +0000 (16:33 +1000)]
Add tests for instantiating cursor delegates in the Loading state.
Components created by QML are usually (always?) ready when assigned to
n property, but it possible for an externally supplied component to
still be loading, as in the test and the code handles it.
Change-Id: I2058e3479e2e711b52af2a0128e6e4c4c3ff7504
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Andrew den Exter [Mon, 9 Jul 2012 04:45:30 +0000 (14:45 +1000)]
Remove code for unused LinksAccessibleByKeyboard option.
The text interaction flags aren't exposed publicly and the option isn't
set by TextEdit itself so there's no need to handle it.
Change-Id: I83b98e58e3b8cb8c55752d8eefe3bf36bff75249
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Toby Tomkins [Wed, 11 Jul 2012 03:00:08 +0000 (13:00 +1000)]
Remove insignificant flag because test is passing reliably.
Change-Id: I373a013d22a71695399b1d3f03c602eaf68409fe
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Glenn Watson [Wed, 11 Jul 2012 01:50:47 +0000 (11:50 +1000)]
Fix test for value type interceptors.
In release mode, floating point inaccuracies can cause this test
to fail. Use a fuzzy compare since it doesn't affect what the test
is actually trying to check for.
Change-Id: I5e3d073614090450216c33fcc561a7454cf44ac3
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Chris Adams [Mon, 9 Jul 2012 06:12:49 +0000 (16:12 +1000)]
Document how to register namespaced types with the QML typesystem
Previously, the documentation wasn't clear that C++ types declared
in a namespace need to fully qualify any references to namespaced
typenames in order for them to be processed correctly by the meta
type system.
Task-number: QTBUG-15459
Change-Id: I3a1e5c441ad8d4c58e169bdf531cdefb935e7770
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Matthew Vogt [Mon, 9 Jul 2012 04:54:18 +0000 (14:54 +1000)]
Fix qmlscene initial resize for delayed loading
When QQuickView acquires a default initial size while waiting for
the source component to be loaded, the resulting width() and height()
are 1 rather than zero. Fix the check for default size after component
has loaded to account for this disparity.
Change-Id: Ifaf418525e66dcc094c87ac1f9b63d1b05a08fd7
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Michael Brasser [Mon, 9 Jul 2012 01:01:48 +0000 (11:01 +1000)]
Update usage of childrenRect in Flickable docs.
The childrenRect of the Flickable itself is rarely what is wanted when
setting the contentWidth and contentHeight.
Change-Id: Ica13a0955869157957b9d3b5917c634ea9c51e30
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Toby Tomkins [Mon, 9 Jul 2012 03:26:18 +0000 (13:26 +1000)]
Specify platform that test is insignificant, has flaky behaviour.
Change-Id: If18aaabdb68967a0396c84fe1410b820828acc7f
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Toby Tomkins [Mon, 9 Jul 2012 04:04:17 +0000 (14:04 +1000)]
Remove superfluous DEFINE no longer used in source code.
Task-number: QTBUG-23385
Change-Id: I9115139e62d89db525e79c1800754b7df80d39d6
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Chris Adams [Thu, 5 Jul 2012 01:53:18 +0000 (11:53 +1000)]
Don't provide typehint in QQmlExpression::evaluate()
Previously, the result returned by QQmlExpression::evaluate() was
converted from the actual JavaScript result with a default typehint
of QList<QObject*>. This commit removes that typehint so that the
engine's conversion code will choose the most appropriate return type
for the result JavaScript value, instead.
Task-number: QTBUG-17082
Change-Id: I368a018b235e9e001b1b92db3699de377748b74f
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Chris Adams [Fri, 6 Jul 2012 06:02:46 +0000 (16:02 +1000)]
Improve documentation for JavaScript expressions and imports
This commit splits the import documentation out of the expression
documentation, and corrects various ambiguities or errors in the
JavaScript-related documentation.
Change-Id: I351b0676f7271efba7cbff90c133dfe008321fb8
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Matthew Vogt [Fri, 6 Jul 2012 03:04:53 +0000 (13:04 +1000)]
Improved error messages for malformed .import statements
Report errors in .import statements, rather than pass them through
to V8 to yield 'Syntax error'.
Task-number: QTBUG-24867
Change-Id: I111b3bd3d198e97f42b29591f61753e86295aeb2
Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
Chris Adams [Tue, 26 Jun 2012 08:02:35 +0000 (18:02 +1000)]
Fix broken value-type support by allowing property definition
In QtQuick 1.x the "variant" property type was supported, which could
be used to allow value type properties to be defined in QML. In
QtQuick 2.0, we have deprecated the "variant" property, but its
replacement ("var") is not suited for defining lightweight C++ type
values (such as QColor, QFont, QRectF, QVector3D etc).
This commit allows those QML basic types to be used in QML once more,
by supporting them in the property definition syntax.
Note that since some value types are provided by QtQuick and others
are provided by QtQml, if a client imports only QtQml they can define
but not use properties of certain types (eg, font).
Task-number: QTBUG-21034
Task-number: QTBUG-18217
Change-Id: Ia951a8522f223408d27293bb96c276281a710277
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
Oswald Buddenhagen [Tue, 3 Jul 2012 19:37:01 +0000 (21:37 +0200)]
use centralized handling of QT_BUILD_PARTS
Change-Id: I14f08527a0b3a1bd58f815d28ebb4f38094d3bb7
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Tasuku Suzuki [Tue, 29 May 2012 01:36:45 +0000 (10:36 +0900)]
load plugins properly when QT_NO_SETTINGS is defined
Change-Id: I2d28d698f4bb5cc299f1ce83b1ecb7fa87bc5fdb
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Oswald Buddenhagen [Mon, 9 Jul 2012 16:50:06 +0000 (18:50 +0200)]
nicer gitignore
Change-Id: I6e7afb77c98060c2968aa2fd7ede2435117205e3
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Oswald Buddenhagen [Mon, 9 Jul 2012 19:02:36 +0000 (21:02 +0200)]
remove dead files
apparently these qml1 plugins moved out even before the patch adding
these files landed ...
Change-Id: Ie1cdd558787fedc9abe57ee8f2324f873b983cab
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Friedemann Kleint [Tue, 10 Jul 2012 12:05:34 +0000 (14:05 +0200)]
Fix warnings about multiple rules for install_targets.
- Remove the accessility scope from the profile since
the parent plugins.pro already does that
- Remove the target lines since they are also in
../shared/qaccessiblebase.pri.
Change-Id: I6d95bf43b4dd9de8627713df2eecac5cd526cd79
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Andrew den Exter [Tue, 5 Jun 2012 06:43:57 +0000 (16:43 +1000)]
Don't cache visual data model v8 handles.
The external resource is reference counted and resused irregardless of
whether the handles are cached, and the reduction in the number of
handles allocated needs to be comes at the cost of keeping persistent
handle which have a negative impact on garbage collection.
Change-Id: I92996faab08a0ff76d21e56dbdafdd7522882d2c
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Eskil Abrahamsen Blomfeldt [Wed, 4 Jul 2012 12:56:38 +0000 (14:56 +0200)]
Add option to use native rasterizer for SceneGraph text
For old-style (desktop components) apps using QML 2 on regular density
displays, distance field text will look out of place. We introduce
an option to use the native rasterizer instead if you would rather
have native look and feel than scalable text items.
Change-Id: Idb38e3c89f2deab9ae1963357c6c5fb235ddeab8
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
Michael Brasser [Tue, 10 Jul 2012 03:10:28 +0000 (13:10 +1000)]
Stabilize Loader test.
Wait for Loader to load its item, rather than using
a fixed timeout value.
Change-Id: I97ee56d0d7161c9c71a5524f108b0f56d92cc3f3
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
Matthew Vogt [Tue, 10 Jul 2012 05:01:19 +0000 (15:01 +1000)]
Remove unwanted whitespace from test URLs
Change-Id: Ia39c7bc458f46a8a32c1e54a8963b1f89dbbf271
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Friedemann Kleint [Mon, 9 Jul 2012 12:51:43 +0000 (14:51 +0200)]
Fix warning about assigned/unused variable.
Change-Id: I0c9a7c4bf52e5a1a81d5ac85fc594ad197e3b811
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Friedemann Kleint [Fri, 6 Jul 2012 12:10:38 +0000 (14:10 +0200)]
Use qWaitForWindowActive() where it is required.
Prepare a change in qtbase in which the implementation
of qWaitForWindowShown() will be changed to
qWaitForWindowExposed() instead of qWaitForWindowActive().
Try to stabilize further tests by introduing
wait functions instead of calls to qApp->processEvents().
Change-Id: I9825885430d78be1610a3fe20023fad24aaacba9
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Andrew den Exter [Thu, 5 Jul 2012 02:40:13 +0000 (12:40 +1000)]
Speed up Text construction with RichText
Setting the page size to empty can short cut some unnecessary layouts
triggered by QTextDocument/QTextDocumentLayout prior to the Text item
requiring a layout.
This rougly halves the construction time a Text item with RichText.
Task-number: QTBUG-19728
Change-Id: I03e6d293d8e5ac40046aef41171ca5009b718546
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Andrew den Exter [Thu, 5 Jul 2012 00:18:43 +0000 (10:18 +1000)]
Speed up TextEdit construction time.
Defer setting content on the QTextDocument until componentComplete()
to avoid unnecessary layouts and move one time setup for the
text document from setContent to the constructor.
Reduces the construction time of a TextEdit with RichText textFormat
by about a third.
Change-Id: Idde0772063bf769cde984efddd68589c55a7431a
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Matthew Vogt [Thu, 5 Jul 2012 23:53:03 +0000 (09:53 +1000)]
Do not permit excessive recursion in component creation
Limit recursion during component creation to prevent infinite
recursion resulting in a crash. Recursion results from invoking
createObject() in the Component.onCompleted handler.
Task-number: QTBUG-25439
Change-Id: Ica2ba099d82b5747c938501af04e67f7ace8402e
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Matthew Vogt [Mon, 4 Jun 2012 04:43:38 +0000 (14:43 +1000)]
Use V4 binding for non-final properties where possible
When a property referenced in a binding is not marked as final, do not
automatically abort optimization. Instead generate both V4 and V8
binidngs, and only fall back to the V8 binding if necessary at run time.
Change-Id: I1bcc7e2b495935c5d519a9a223f640c1972cdb4e
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Andrew den Exter [Thu, 7 Jun 2012 05:56:16 +0000 (15:56 +1000)]
Reduce the number of unnecessary layouts on geometry changes.
Improve checks for geometry changes that don't affect layout, i.e
width increasing when the previous layout didn't wrap or elide.
Set implicit sizes just once during layout rather than setting the
implicit width during and the implicit height after to limit the when
an implicit size change can change geometry.
And if there are multiple layouts of the same text/font combination
re-use cached layout data as much as possible by guarding against
unnecessary property changes on the layout, and not creating a new
layout for calculating the implicit size of truncated text.
Change-Id: Ia05e52e9170e1f5d3364896ab119e00d8a318299
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Matthew Vogt [Thu, 5 Jul 2012 05:00:24 +0000 (15:00 +1000)]
Expand test case for qrc:/ URLs
Change-Id: Ibf8a04efbcb9d39938201f65c1fc0f236243a287
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Andrew den Exter [Fri, 29 Jun 2012 07:06:38 +0000 (17:06 +1000)]
Allow all explicit margins to override margins.
Task-number: QTBUG-24515
Change-Id: Ibfc657dec9fd0c8e71cf3686a04ea7b00ad72c11
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Alan Alpert [Thu, 5 Jul 2012 06:14:58 +0000 (16:14 +1000)]
Remove Qt::WindowFlags from QQuickView constructor
It's no longer in the constructor of QWindow. Those who wish to set it
can use the setWindowFlags function.
Change-Id: I8df57ed1ced8128723d790caaaaaaaaaaaaa787d
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Alan Alpert [Fri, 6 Jul 2012 00:38:12 +0000 (10:38 +1000)]
Clarify jumpTo docs
Task-number: QTBUG-24769
Change-Id: Ib58a47deea2706f7fd683106380d1618d8b1d2cc
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Alan Alpert [Fri, 6 Jul 2012 00:36:12 +0000 (10:36 +1000)]
Update Age affector doc references
Task-number: QTBUG-26240
Change-Id: Ib58a47deea2706f7fd683106380d1618d8b1d2cd
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Andrew den Exter [Thu, 5 Jul 2012 06:08:09 +0000 (16:08 +1000)]
Use enumeration in preference to enum when referring to QML API.
Task-number: QTBUG-24666
Change-Id: I5197d4b4d1a1b53cae2033bd86ce26ba55d08384
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Jiang Jiang [Wed, 4 Jul 2012 16:49:20 +0000 (18:49 +0200)]
Use qFloor instead of qRound for glyph coordinates
Like we did in raster paint engine to make sure glyphs are positioned
correctly.
Change-Id: I1327b8727bd2b5085dfb2edc11b4d049403a2fb5
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Andrew den Exter [Tue, 3 Jul 2012 04:00:25 +0000 (14:00 +1000)]
Use unique port numbers for http servers in auto tests.
Prevents conflicts when tests are run in parallel.
Change-Id: Ic1652d963da291c7c41b31e2621874824fa575cb
Reviewed-by: Damian Jansen <damian.jansen@nokia.com>
Andrew den Exter [Tue, 3 Jul 2012 06:50:40 +0000 (16:50 +1000)]
Fix QQuickApplication::activate test.
ApplicationActivate and ApplicationDeactivate events are now delivered.
Task-number: QTBUG-21573
Task-number: QTBUG-23331
Change-Id: I58e8d7c7730c66ec210f04a74a945d3eece61e01
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Bea Lam [Thu, 5 Jul 2012 00:41:56 +0000 (10:41 +1000)]
Remove sections with no doc content for now
Change-Id: I23566853ffebec4de3c48ce4f5cd1c4b1f2389d5
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Bea Lam [Tue, 3 Jul 2012 05:51:04 +0000 (15:51 +1000)]
Fix various QtQuick.* submodule docs
- Create module index pages for QtQuick.Window, QtQuick.XmlListModel and
QtQuick.LocalStorage.
- Fix references to module names in docs so that docs for properties
and methods are actually generated e.g. use "QtQuick.Window2" instead
of "QtQuick2.Window".
There's no easy way to document Module APIs at the moment so the
QtQuick.LocalStorage documentation has been updated in a hacky way to
generate the correct method documentation.
Change-Id: I7b34e4b4ac794acffc6d198b98e2115ccf0fa9a6
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Laszlo Papp [Wed, 4 Jul 2012 06:54:43 +0000 (07:54 +0100)]
Add references between being/completeCreate in the documentation
Change-Id: I14f1c802347c9dad86f3fd7a9e858209a15d34e6
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Bea Lam [Tue, 3 Jul 2012 01:45:26 +0000 (11:45 +1000)]
Reorganize "concept" pages in QtQuick docs
This removes concepts/topic.qdoc and move this content into individual
concept topic pages under individual directories for each concept to
avoid having a really long "concepts" index page.
This change also:
- Moves components.qdoc ("Defining reusable components") into the
appdevguide/ since it's not specific to QtQuick features - it's more
about how to use a QtQml feature to build QML apps.
- Moves the part of qtqml/doc/src/cppintegration/data.qdoc that
discusses how to use C++ models with QtQuick views into
quick/doc/src/concepts/modelviewsdata/data-cppmodels.qdoc.
Change-Id: Id18a1d56acaaac41714c13cbc94bb3b80f337355
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Andrew den Exter [Fri, 29 Jun 2012 03:15:33 +0000 (13:15 +1000)]
Add some private V8ASSERT macros.
Simple variation on the V8THROW macros to consilidate the normal usage
pattern of if (!condition) THROW.
Change-Id: I71aaabab705c3f73922efdaf8bb40b5dcc390101
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Kim Motoyoshi Kalland [Tue, 3 Jul 2012 14:05:13 +0000 (16:05 +0200)]
Let ShaderEffectSource use same multisample count as GL context.
Change-Id: I9b772a2c405c2fab13dfee3527212117de16e9c0
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Thomas McGuire [Tue, 3 Jul 2012 14:13:46 +0000 (16:13 +0200)]
qmlplugindump: Add comment to file that it was auto-generated
This prevents people who do not know about this tool from
accidentally changing these files by hand.
Change-Id: I8ff889b953f7c637f914f8b5b8b07a36f3cdf58f
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Eskil Abrahamsen Blomfeldt [Tue, 3 Jul 2012 12:10:20 +0000 (14:10 +0200)]
Compile without RTTI support
We need to be able to compile without RTTI support. Fortunately
QPaintEngine has built-in type info. No RTTI support is the
default configuration on Windows with MSVC2010, so this is
required to fix the build there.
Change-Id: I89b1ed4879fd0e8e0d61ef12d77f6961fd0b07e5
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Martin Jones [Wed, 4 Jul 2012 02:37:38 +0000 (12:37 +1000)]
Document QQmlComponent::create(QQmlIncubator&, ...)
Task-number: QTBUG-25132
Change-Id: Ice6c75cbd7a45519ce7f38190db3fae95146269e
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Martin Jones [Tue, 3 Jul 2012 03:57:54 +0000 (13:57 +1000)]
PathView needs drag events similar to Flickable
Added dragging property and dragStarted() and dragEnded() signals.
Task-number: QTBUG-21740
Change-Id: I718835ff7e46af615951ec5f248eba41bac31071
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
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>