Friedemann Kleint [Wed, 12 Jun 2013 13:42:54 +0000 (15:42 +0200)]
QFileDialogHelper: Force QWindow before setting flags.
Fixes a crash when clicking the dialog icon in the
QtQuickControls gallery example.
Change-Id: I7a3b2321f4a1bf179dced8e98598559f396386db
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Shawn Rutledge [Tue, 11 Jun 2013 12:44:10 +0000 (14:44 +0200)]
move quick dialogs example into an artificial subdirectory again
The trouble with Id28d5718b4b7b475dcd7d62e31c4634219dc3ddc is that
the build assumes that all example directories are subdirectories, so
the examples-manifest.xml will point to the wrong place and creator
ends up not having the example on the welcome page. That's more rigid
than it should be, but we might as well use the opportunity to
distinguish system dialogs from any QML-only dialogs that might be
added to this module later on.
Change-Id: I6e7261e096d75df560c6ce608af4c54b82e52d13
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Shawn Rutledge [Tue, 11 Jun 2013 07:55:14 +0000 (09:55 +0200)]
Clean up qt quick dialogs example again
I5245a6931606673733130b1f168fddafe8def695 took us the wrong direction:
the intention was to put ALL dialogs in one example, because each
example has some overhead (project, docs, screenshot, c++ launcher)
and we don't want to have several more separate examples after the other
dialog types are added. Color and file dialogs have no relationship
to each other except that they happened to be implemented first.
This is analogous to qtbase/examples/widgets/dialogs/standarddialogs
And in fact, each dialog type is in a separate qml file, so you can
run them individually with qmlscene anyway, which will keep this
from becoming unwieldy and hard to understand.
Change-Id: Id28d5718b4b7b475dcd7d62e31c4634219dc3ddc
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Oswald Buddenhagen [Fri, 7 Jun 2013 14:26:49 +0000 (16:26 +0200)]
prepare for qt_module_pris.prf changes
Change-Id: Iba75fccfc143f09d443d50bc8dc75cde5739af9b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Kai Koehne [Mon, 10 Jun 2013 07:48:21 +0000 (09:48 +0200)]
Fix compiler warning about unused parameter
Fix gcc compiler warning about unused parameter:
qquickwindow.cpp:111:10: warning: unused parameter ‘e’ [-Wunused-parameter]
This got introduced by commit
9d75626b
Change-Id: Ia280fd9fdd584eed81f4d810311c56f5daee3e28
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Topi Reinio [Mon, 10 Jun 2013 09:54:03 +0000 (11:54 +0200)]
Doc: Exclude Qt Quick Dialogs examples in qtquick.qdocconf file
Qt Quick Dialogs has its own .qdocconf file where the example path
is defined. This change removes the path from .qdocconf for Qt Quick
module so qdoc doesn't try to parse it twice.
Change-Id: I06ad6895d5929031c37e21bfa91a813ba60d86d2
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Florian Hänel [Mon, 3 Jun 2013 11:40:09 +0000 (13:40 +0200)]
Fix null-pointer access in QQuickVisualDataModelPrivate
I observed null cachItem->contextData which lead to null-pointer access
on cacheItem->contextData->destroy().
Task-number: QTBUG-31439
Change-Id: I91f28a3ee1ac83446ecde1801a1cb7962fb883f3
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Alan Alpert [Fri, 31 May 2013 17:43:04 +0000 (10:43 -0700)]
Add future compatibility note
File selectors are being delayed from releasing at the same time as
QQmlApplicationEngine, but will need to be enabled by default
(in QQmlApplicationEngine only) when they do arrive. Adding a note to
the documentation to help forwards compatibility.
Change-Id: Ia47a1da1afebd0da3bd1a97e7e4c8ee85f70b49a
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Alan Alpert [Fri, 31 May 2013 17:38:33 +0000 (10:38 -0700)]
Set incubation controller when a Window{} is loaded via QQmlApplicationEngine
This was the one convenience that was lost when transitioning templates
from QQuickView + Item{} to QQmlApplicationEngine + Window{}.
As the default window incubation controller was tied to the first
window's frameSwapped, we could easily run into a situation where
a secondary window required incubation while the first window
was idle. This would then starve the incubation controller. Instead
make it so that the renderloop emits "timeToIncubate" once it
is done with a renderpass over all windows, so the incubator
gets to run once and exactly once per vsync when animating.
The incubator logic was also flawed in that it could post
a lot of events to itself as a result of incubatingObjectCountChanged
and thus starve system events while processing incubation requests.
Now we start a timer and don't start it again until we have
completed an incubation pass.
Task-number: QTBUG-31203
Change-Id: Iea9e2c81efb46bb7875c70ccda0cdc4b3b3e58e7
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Jerome Pasion [Thu, 6 Jun 2013 12:51:31 +0000 (14:51 +0200)]
Doc: Fixed link to Qt Quick Layouts and made links consistent
-better to use the "QML Types" pages as the version is not specified.
Change-Id: I5b150bc8ada25c619dbecb5d68e70854dd9c14d6
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Jerome Pasion [Wed, 5 Jun 2013 12:15:10 +0000 (14:15 +0200)]
Doc: Fixed QCH listings for Qt QML and Qt Quick Dialogs
Qt QML: added QML types page as a child in the list
Qt Quick Dialogs: "manual" as type taken out
Change-Id: I95d77b7582a0f5729801e1e6fb8f5f3242a0b760
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>
Alan Alpert [Tue, 4 Jun 2013 22:32:36 +0000 (15:32 -0700)]
doc fix
Task-number: QTBUG-31539
Change-Id: I527ed10231c112f8f1727fde093f7d661d492fa6
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Caroline Chao [Tue, 4 Jun 2013 08:08:22 +0000 (10:08 +0200)]
Doc: Update Qt Quick Controls description
Change-Id: Ifb67ae32fcb8abe49166346fa1017dc5c76bc485
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Gunnar Sletta [Tue, 4 Jun 2013 07:01:36 +0000 (09:01 +0200)]
Stabilize tst_qquickanimatedimage::mirror_notRunning()
Task-number: QTBUG-31370
Change-Id: I200d94dccd1314c891df92576b0d2b704e530e16
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Shawn Rutledge [Fri, 31 May 2013 13:33:45 +0000 (15:33 +0200)]
qmlscene: if top-level is a QQuickWindow, set incubation controller
The necessity for this is documented in the
QQuickWindow::incubationController() accessor. Bug 31203 is about
writing a custom main() with a QQmlApplicationEngine, not about
qmlscene, but the same workaround is necessary for both. Hopefully
soon we find a way to make it unnecessary, but for now it is.
This fix also doesn't take care of the QtObject { Window { } }
use case.
Task-number: QTBUG-31203
Change-Id: Ic9a5e4a23ac918593138dc9cab3de6cd36453eaf
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Jerome Pasion [Thu, 30 May 2013 09:09:13 +0000 (11:09 +0200)]
Doc: Clarified members of QtQml.Models submodule.
-Took out members of QtQml.Models submodule from Qt QML and Qt Quick.
-Set up qdocconf files to include QtQml.Models to be part of Qt QML
doc build.
-Edited the sentences to make it clearer that list and model types
are in QtQml.Models.
-Placed the Visual* types back to QtQuick 2 module.
-This patch removes several collision pages.
Change-Id: I16e7045162af6852e5d6c3162b6f4cf97a42402b
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Alberto Mardegan [Thu, 30 May 2013 07:36:09 +0000 (10:36 +0300)]
Update Changes file
Mention the behavioral change introduced by the fix for QTBUG-29836.
Task-number: QTBUG-29836
Change-Id: I15ffd32fd5c0d537528f7b1386691103dab371c7
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Alberto Mardegan [Wed, 29 May 2013 08:29:52 +0000 (11:29 +0300)]
QQmlPropertyCache: check methods before properties
When creating the QQmlPropertyData, search within the methods list
before searching for properties. The reason is that if the meta object
is dynamic, looking up a property will always return a result (if the
property doesn't exist, it will be created) and therefore all methods
will be obscured.
By swapping the search order, we eliminate this risk (methods are not
dynamically added).
Task-number: QTBUG-29836
Change-Id: Ie367f757c37ef4bc834a6c1c009f27bcf344fe76
Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Alberto Mardegan [Fri, 24 May 2013 07:46:39 +0000 (10:46 +0300)]
Fallback to QMetaObject for properties not in QQmlPropertyCache
QQmlOpenMetaObject does not update the QQmlPropertyCache when new
properties are added, meaning that the QQmlPropertyCache might not
contain all of the dynamic properties of an object. Therefore, make
QQmlPropertyCache fallback to reading the QMetaObject when a property is
not found.
Task-number: QTBUG-31226
Change-Id: I760aaa155b1952f6f52ab9ce173fb9547f8e34a6
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Simon Hausmann [Wed, 29 May 2013 09:14:51 +0000 (11:14 +0200)]
Deprecate the with statement in QML
It is generally considered deprecated in JavaScript and its use disables
a whole range of optimizations that we would like to apply in the future.
Therefore this patch will issue a warning if the with statement is detected.
This change is also documented, along with the plan on enabling strict mode
in the future.
Change-Id: Ie60f0536e0bdd6ecc537d8e34efbd8868bcad743
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Gunnar Sletta [Fri, 31 May 2013 10:17:20 +0000 (12:17 +0200)]
Stabilize tst_touchmouse
Change-Id: I6d34571b85f99f780b03f7871f39dbf3be546006
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Gunnar Sletta [Fri, 19 Apr 2013 13:30:41 +0000 (15:30 +0200)]
Precompile the most common materials
Change-Id: Idfa76f9fcdbac61a248b38e1f793a6628af12552
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Caroline Chao [Wed, 29 May 2013 12:03:23 +0000 (14:03 +0200)]
Doc: Fix the positioning topic page
Mention both Positioners and Qt Quick Layouts.
Also add qtquickdialogs to qtquick.qdocconf.
Change-Id: I19bc09a0a81be7c748af83ddf38f1111f0ecc81a
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Shawn Rutledge [Wed, 29 May 2013 08:29:08 +0000 (10:29 +0200)]
Added QQuickWindow::setDefaultAlphaBuffer()
All QQuickWindows will render using the same OpenGL context, so
for a window to support transparency, the OpenGL context needs
to be created with support for transparency from the very start.
Therefore the application needs to call setDefaultAlphaBuffer()
before creating windows. There are some relevant comments in
QTBUG-20768 although the bug itself is not the same use case
(it was already OK as long as the first window had a translucent
color, because of setAlphaBufferSize in QQuickWindow::setColor()).
Change-Id: I92e111c1a62c0d510821b646fd334e52254f8f57
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Shawn Rutledge [Wed, 29 May 2013 13:22:32 +0000 (15:22 +0200)]
Fix various bugs in calqlatr
It's still not a great example but at least it's somewhat usable now.
- added files to .pro so you see them all in Creator
- keypad is fixed size and the "tape" takes up the rest, so you can
resize the window to be able to see long numbers
- you can flick the ListView (MouseArea not on top of the whole thing!)
- ListView scrolls to the bottom when you add numbers past the point
that scrolling is necessary to see them
- Clear, sqrt and +/- keys are functional
Task-number: QTBUG-26556
Change-Id: I485e4123ad6c24ca64bad3efc3acfc14587268d8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Shawn Rutledge [Wed, 29 May 2013 08:58:38 +0000 (10:58 +0200)]
window example: show only the splash screen until the timeout
The window takes time to resize itself; we can avoid letting the user
see that by delaying visibility of the main window.
Change-Id: I81d656102b384a66b5539cbd879aadb85261ba33
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Jan Arve Saether [Fri, 24 May 2013 14:56:26 +0000 (16:56 +0200)]
Doc fixes to the Positioners/Layouts documentation
* Add references to Qt Quick Layouts
* Don't lie about that Positioners can resize the items
* Rename title from "Item Layouts" to "Item Positioners" to avoid
confusion with Qt Quick Layouts
Change-Id: I43e3ad6e6d9e4b08a1233868c75f0efcab43f8c3
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Jerome Pasion [Mon, 27 May 2013 13:01:51 +0000 (15:01 +0200)]
Doc: Added Qt 5.1 details in Qt QML's release notes.
Change-Id: Ie5a4199563b22c21d7be009aeb85206670b84642
Reviewed-by: Martin Smith <martin.smith@digia.com>
Topi Reinio [Wed, 29 May 2013 07:46:20 +0000 (09:46 +0200)]
Doc: Fix links for ListModel and ListElement types
Link to documentation under QtQml module.
Change-Id: Id65d237558c235dcdda8ab206eddef23c2886a29
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Topi Reinio [Wed, 29 May 2013 09:01:22 +0000 (11:01 +0200)]
Doc: Fix various problems in Qt Quick Dialogs documentation
This change fixes the following things in .qdocconf:
- CamelCase for project name (required for generating valid tags
in example manifest file).
- Proper selector for QML Types topic
- Fix exampledirs to not pull in all the Qt Quick examples
- Add examplesinstallpath to make Qt Creator see the examples
Also fixes the paths in example docs according to changed exampledirs.
Change-Id: If18f7b5a3160d85814d508e1cbfb7bdb1a002c54
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Jerome Pasion [Tue, 28 May 2013 13:59:29 +0000 (15:59 +0200)]
Doc: Excluded Dialogs directory from Qt Quick doc build.
Qt Quick Dialogs is separate and should be excluded from the Qt Quick
doc build.
Task-number: QTBUG-30180
Change-Id: I6e63efc071d8d2e5673745f0dcd97d5b5f562d25
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>
Albert Astals Cid [Wed, 15 May 2013 15:28:35 +0000 (17:28 +0200)]
Make sure tryCompare value argument is not undefined
It happens often that people convert a
compare(foo.bar, 3)
to a
tryCompare(foo.bar, 3)
and unfortunately that succeeds but doesn't do what they expected
This makes tryCompare fail if no third argument is given
Task-number: QTBUG-31427
Change-Id: I0c9618dae9aad4be55aa35c3e2dcf3535728beaa
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Kai Koehne [Tue, 28 May 2013 08:35:23 +0000 (10:35 +0200)]
Animations: Avoid accessing invalid memory if stop() triggers deletion
Return immediately if calling stop() results in the current object being
deleted.
Task-number: QTBUG-31247
Change-Id: I684a858bfb4cc53f415daa8cc1c4df96067daa1c
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Caroline Chao [Tue, 28 May 2013 07:00:58 +0000 (09:00 +0200)]
Dialogs: Create directory structure for documentation
Change-Id: I5245a6931606673733130b1f168fddafe8def695
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Gunnar Sletta [Tue, 28 May 2013 07:42:05 +0000 (09:42 +0200)]
Do not draw negative-size ShaderEffect(Source) items.
We were a bit inconsistent here. A negative size Image element would not
render at all, a negative size ShaderEffect would render mirrored
and a negative size ShaderEffectSource would trigger an assert.
Be consistent and not draw any of them.
DropShadow from QtGraphicalEffects uses both a ShaderEffectSource and
a ShaderEffect together, so keeping the behavior in ShaderEffect
would make it render incorrectly.
Task-number: QTBUG-31383
Change-Id: Ied5568d7edbc2aed96b00adfdc6aae09b6f2a7d9
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Frederik Gladhorn [Tue, 28 May 2013 13:06:25 +0000 (15:06 +0200)]
Accessibility: Fix crash when accessing accessible children.
The window would create new child interfaces every time
it's children are queried. Instead properly use the
crash.
Task-number: QTBUG-31417
Change-Id: Ifc7bbdbdb9a506fe04a348fba643f1d52a6157e7
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
Shawn Rutledge [Mon, 27 May 2013 16:44:34 +0000 (18:44 +0200)]
Package dialogs examples into a single executable
Introduced tabs and added the C++ boilerplate launcher.
Change-Id: Ibb49a182e3928aba5dced097d5307eb7d1f4b42d
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Shawn Rutledge [Fri, 8 Mar 2013 15:44:52 +0000 (16:44 +0100)]
window and Screen example: new properties; splash screen
Demonstrates the new properties, how to make a splash screen, and
how to make a standalone app with an icon. Combined the Screen info
into this example too.
Change-Id: I5b731539b39c55327f4e5b93860a880a35835896
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Liang Qi [Mon, 27 May 2013 08:19:35 +0000 (10:19 +0200)]
Prevent tab focus from wrapping endlessly
If there was no item that accepted focus, it would go into an
endless loop.
This also changes the default behavior of QQuickWindow. When there is not
any activeFocusItem in the whole window, it means the contentItem got
focused. The Tab/BackTab key will now focus the next item in the tab focus
chain.
Autotest is included.
Done-with: Frederik Gladhorn <frederik.gladhorn@digia.com>
Task-number: QTBUG-31344
Change-Id: I854292f89a327c493eec21969907c94aa9cfddcb
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Jerome Pasion [Mon, 27 May 2013 12:46:54 +0000 (14:46 +0200)]
Doc: Added Qt 5.1 information in Qt Quick's release notes.
Change-Id: I97971f27d9ff7e94e14f442d1baf78b0e56ca312
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Caroline Chao [Mon, 27 May 2013 12:20:31 +0000 (14:20 +0200)]
Doc: Add Qt Quick Dialogs to Qt Quick submodules list
And add a landing page for Qt Quick Dialogs.
Change-Id: I0c2611bf5cdbf9937b4fd94228915553d8b3bb77
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Sergio Ahumada [Fri, 24 May 2013 20:06:08 +0000 (22:06 +0200)]
sync.profile: Point dependencies to an empty string
This means that we are going to use the same branch name for the
dependencies as the branch of the repository under test.
If we are testing the 'stable' branch, all dependencies will point
to the 'stable' branch as well.
Change-Id: I0959eea83b620af805b2113422bae5ae306af120
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
Liang Qi [Mon, 27 May 2013 10:52:40 +0000 (12:52 +0200)]
Update all plugins.qmltypes files
Task-number: QTBUG-31388
Change-Id: I13a821a009c6c06f2c7fe7f7d28f1a579d69c8df
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Shawn Rutledge [Mon, 27 May 2013 13:19:14 +0000 (15:19 +0200)]
skip failing qquickanimatedimage mirror tests for now
Failing on mac, which is a blocker for CI.
Task-number: QTBUG-31370
Change-Id: Icb42bb5ae59510a8754de895070d7a3d08af2623
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Caroline Chao [Mon, 27 May 2013 07:37:33 +0000 (09:37 +0200)]
Doc: Add Dialogs/Controls/Layouts in submodules section
Change-Id: Ide4afaa74d73ea09cf329de593283c269ecdacb3
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Christiaan Janssen [Fri, 24 May 2013 14:07:13 +0000 (16:07 +0200)]
QmlProfiler: fix SceneGraph profiling
Change-Id: I54c960f0b0da061816223a51795c83a9f9dd3f66
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Kai Koehne [Fri, 17 May 2013 13:15:31 +0000 (15:15 +0200)]
Debugger: Make sure client list is protected by mutex
So far we didn't protect this access.
Change-Id: Id738453db5e655371fa2fbf88f81cab6c0af466f
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
Friedemann Kleint [Wed, 22 May 2013 15:18:46 +0000 (17:18 +0200)]
qmlscene: Set window flags correctly.
Task-number: QTBUG-31258
Change-Id: I13dfc17c75075de155505d20c57400753de0a71d
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Albert Astals Cid [Tue, 21 May 2013 14:09:58 +0000 (16:09 +0200)]
Do not return cacheItem->object if it is still incubating
It can happen that cacheItem->object in QQmlDelegateModelPrivate::object
already has a value but that the cacheItem->incubationTask is still
Loading. If we return the object here we can confuse some of QQmlDelegateModel
consumers like QQuickItemView.
E.g. in QQuickItemView if we get to return the object before the createdItem
signal is emitted we will make that when the createdItem signal happens
QQuickItemView::createdItem will be called it will add the item
to unrequestedItems items and will expect that layout/refill will
remove it from unrequestedItems if it is really one of the items we are
creating, but as it has been already created the item will wrongly remain
in unrequestedItems making the item view to act weird
Task-number: QTBUG-28403
Change-Id: I4359391eb2a4012afd3f01d082a99692d63b6639
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Gunnar Sletta [Sat, 18 May 2013 06:20:30 +0000 (08:20 +0200)]
Cut performance cost in QSGContext::prepareMaterial()
The hash-lookup in this function is costing us a lot, and
since we're looking up the same materials again and again,
and the material has a place holder for it, we can store it
directly in the material at no extra cost. This was a 10%
gain in this particular benchmark.
Change-Id: I46b67791ce39f453fa86d1ee82f6f5c7785b46a1
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Gunnar Sletta [Wed, 22 May 2013 19:04:04 +0000 (21:04 +0200)]
add private export to image and rectangle nodes
Change-Id: I15aea1b1dc3d41c9efe0a38f53d6858bae273566
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Shawn Rutledge [Wed, 22 May 2013 13:17:56 +0000 (15:17 +0200)]
qmlscene: don't call show() on the window if it's already showing
That way Component.onCompleted() can optionally do showMaximized()
without being overridden.
Task-number: QTBUG-31260
Change-Id: I6f5c3025efd3b38809be85da4172241695168a6c
Reviewed-by: Nikita Krupenko <krnekit@gmail.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Alan Alpert [Wed, 15 May 2013 19:53:11 +0000 (12:53 -0700)]
Partial fix for deferred properties when combined with components
Current deferred properties implementation did not store context
or compiled data pointers correctly. Those pointers are now stored
when the defer is reached, so as to avoid confusion (confusion leads
to asserts or crashes).
Does not extend the deferred property support to allow multiple
deferred blocks per item. This now prints and error and the side
effect is only that one of the deferred blocks is lost. This use
case is sufficiently rare that it may not be worth the cost.
Task-number: QTBUG-30325
Change-Id: I80cb074ed4452e95020208a0142a91e721bced7d
Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
J-P Nurmi [Tue, 14 May 2013 17:27:20 +0000 (19:27 +0200)]
Fix TextEdit content size calculation
Task-number: QTBUG-31154
Change-Id: I9d3e31352967b99b4bbb38f5819d3d093438ee37
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Gunnar Sletta [Sat, 18 May 2013 06:31:54 +0000 (08:31 +0200)]
Avoid redundant QColor::alphaF() calls.
Change-Id: I3694b075e98eab9f3eacf7758881a9473999b46e
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Gunnar Sletta [Sat, 18 May 2013 06:24:45 +0000 (08:24 +0200)]
Avoid using QColor::xxxF functions.
In our usecase, the color is always used as a float so using QColor
(which is ushort) internally adds a lot of pointless conversion.
Enough so that it shows up in profiles as 1-2% each. Not a lot,
but easy to fix.
The compare function is also somewhat simplified. For colors we're
primarily searching for equallity. If that fails, we just need to
provide consistent values, so use the address instead of doing
any fancy calculation.
Change-Id: Icae7e78ed767e802c137bab7fcacff66e9a4bc66
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Gunnar Sletta [Wed, 22 May 2013 08:35:27 +0000 (10:35 +0200)]
Disable textureinthread example when threaded gl is not available.
Task-number: QTBUG-30077
Change-Id: I8b6e4b8a33819fe84c843e85d863b582cfd69439
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Liang Qi [Tue, 21 May 2013 08:19:37 +0000 (10:19 +0200)]
Re-enable qmltest on Mac
Only tst_fontloader.qml fails on Mac, and we have useful Qt.platform.os.
Task-number: QTBUG-25306
Change-Id: I6f4082028a188453378ad7ef73f51b1df2d89f11
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
J-P Nurmi [Mon, 13 May 2013 16:14:34 +0000 (18:14 +0200)]
QQuickTextControl: emit cursorPositionChanged() only if it changed
Change-Id: Id6fe03677e93119a63bfe87ade3cd333bf4890a1
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Eskil Abrahamsen Blomfeldt [Tue, 14 May 2013 09:35:02 +0000 (11:35 +0200)]
Android: Make Qt5QuickParticles a dependency of Qt Quick
Since we don't have any way of parsing QML to find out which
imports will be used, we need to always load Qt5QuickParticles
library when using Qt Quick, since this is a dependency of the
particles import itself. Otherwise, apps that use particles
would crash.
Task-number: QTBUG-30848
Change-Id: I24326e2d59fc05f7867233fe503b2708d50eee78
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Caroline Chao [Thu, 16 May 2013 07:28:40 +0000 (09:28 +0200)]
Autotest: fix misuses of tryCompare
Change-Id: Ia06527a0a3c3cfd68ecb3372316de476e02e6c26
Reviewed-by: Albert Astals Cid <albert.astals@canonical.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Albert Astals Cid [Tue, 21 May 2013 14:44:59 +0000 (16:44 +0200)]
Fix comment: Signal is actually createdItem not itemCreated
Change-Id: Ie2a259a02becdf6fb0c21d93013e0e3148187ed8
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Alan Alpert [Fri, 17 May 2013 17:48:28 +0000 (10:48 -0700)]
Fix PropertyAnimation doc
Task-number: QTBUG-31063
Change-Id: I2329f5c92c5985ed4a65a896521ddd3f6649ce2c
Reviewed-by: Bea Lam <bea.lam@jollamobile.com>
Liang Qi [Wed, 8 May 2013 17:22:29 +0000 (19:22 +0200)]
Tools: unnecessary to make qmlplugindump a bundle
Embed Info.plist in qmlplugindump executable in a special way.
Change-Id: I7eb73d0f832ab53d352c1fd2275f77e853269c2c
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Sze Howe Koh [Thu, 16 May 2013 15:53:02 +0000 (23:53 +0800)]
Doc: Fix some broken links
Change-Id: I1385a8947107a7c80b32306fc587aff45536a4ec
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Matt Vogt [Fri, 17 May 2013 00:14:26 +0000 (10:14 +1000)]
Prefer qFatal to assert for failure condition
Otherwise the explanatory message won't be seen in release mode.
Change-Id: I5c9fbc86753ac5ecea3d0714b8f17207f6b713d6
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Alan Alpert [Thu, 16 May 2013 21:32:05 +0000 (14:32 -0700)]
Respond appropriately to textFormat changed
If the text has not changed when textFormat changes between states other
than RichText, the text was not re-laid-out. This is necessary if the
text includes control tags.
Task-number: QTBUG-31191
Change-Id: I3c6f5343aa85e8337b90cf86748a696d5742e906
Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
Liang Qi [Wed, 15 May 2013 12:18:59 +0000 (05:18 -0700)]
Fix a warning when setActiveFocusOnTab(false) for root item
Task-number: QTBUG-31114
Change-Id: I4d6aac534fbc1e84593e4d7084e6a892eea4256c
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
J-P Nurmi [Thu, 16 May 2013 11:09:51 +0000 (13:09 +0200)]
Fix a crash in QQuickRepeater::clear()
Change-Id: Iedf45862323ca8233be155ce65cd3348abd0a8e5
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Alan Alpert [Wed, 15 May 2013 22:50:22 +0000 (15:50 -0700)]
Assert instead of crashing
Using a singleton (at least a QJSValue one) improperly leads to a crash.
Assert with an explanatory comment is a low-cost improvement until
better capitalization checking is implemented.
Task-number: QTBUG-30090
Change-Id: I237a1dd2aab743ae1f09e8d653aa5aeb4bd0240f
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Gunnar Sletta [Thu, 16 May 2013 07:56:01 +0000 (09:56 +0200)]
improve docs of QSGGeometry::set[Vertex|Index]DataPattern
Change-Id: I6ca0d8549891302cc9d71bdfac11704752caaf60
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Sze Howe Koh [Wed, 15 May 2013 13:16:31 +0000 (21:16 +0800)]
Doc: Inline a short snippet
An indirect way of fixing a broken snippet path.
The entire (but very short) file is included as a snippet in only one
place, and the license text takes far more space than the snippet.
Change-Id: I6f4bf588b8701b655d418a71f83a2f9263d6b532
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Sze Howe Koh [Wed, 15 May 2013 14:10:08 +0000 (22:10 +0800)]
Doc: Move snippet into correct module
The snippet belongs to Qt Quick's "QML Basic Type: color"
(src/quick/doc/src/qmltypereference.qdoc)
Change-Id: I47defee04c34f9c98ec57d840c377c680d114d71
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Mitch Curtis [Tue, 14 May 2013 15:04:45 +0000 (17:04 +0200)]
Document Flickable.pixelAligned.
Change-Id: I8ea85269c2666d18bf3c3815d2de0f90e9e0a3f4
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Gunnar Sletta [Wed, 15 May 2013 09:32:54 +0000 (11:32 +0200)]
Make Canvas respect smooth: true/false
Change-Id: I6e68fcfc534aca139484a9b2970e61fb22688c58
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Alan Alpert [Tue, 14 May 2013 17:22:44 +0000 (10:22 -0700)]
Doc fix
Task-number: QTBUG-31155
Change-Id: I4f1ac7c31ce6d4529c368d796706aa5f93a78d1a
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Friedemann Kleint [Mon, 6 May 2013 08:57:53 +0000 (10:57 +0200)]
Fix warnings about unused parameters.
Change-Id: I091a0369f2026ae820d623aadd13a3190d40a56b
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Thiago Macieira [Wed, 8 May 2013 09:19:51 +0000 (11:19 +0200)]
Do not use an export macro in the function definition
qmlExecuteDeferred is exported using Q_QML_EXPORT in
qqml.h, so we don't need to use one here. Better not have any
than have the wrong one, which can cause problems.
Cherry picked from
d6d2074ff in qtquick1
Change-Id: Ief978feb503b7381ed462f71ebbd7986bd6862c3
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Sze Howe Koh [Tue, 14 May 2013 16:03:18 +0000 (00:03 +0800)]
Doc: Update references to QDeclarative* classes
Change-Id: Ifbde8c1ccfc0c759da6f2204320b9170a04179eb
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Alan Alpert [Thu, 9 May 2013 22:46:43 +0000 (15:46 -0700)]
Changelog entry for not-quite-so-important behavior change
Task-number: QTBUG-30837
Change-Id: Ia39c0d85d29cf87861083e4a5170aab701fb2199
Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
Kai Koehne [Wed, 8 May 2013 08:24:15 +0000 (10:24 +0200)]
Move exports conflicting with QtDeclarative into namespace
Move exported qml* symbols that conflict with QtDeclarative into an
- automatically imported - namespace. This ensures apps can
link against both QtDeclarative and QtQml.
To keep the BC promise the old symbols are still exported.
Task-number: QTBUG-29584
Change-Id: I3d31c36ca4e2faaf6f5d67a77c5c5a304c0338a4
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Sérgio Martins [Mon, 13 May 2013 01:12:59 +0000 (02:12 +0100)]
Fix documentation of QtQuick2::DragEvent::accepted, it's a bool.
Change-Id: I4773b8b1c1f96279e34979534a1a53e724009e44
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
David Fries [Wed, 8 May 2013 05:14:25 +0000 (00:14 -0500)]
Doc: corrections, spelling, and ListView requirements comments
From the ListView comment I thought the model had to be derived from
QAbstractListModel, but that's not the case, QAbstractListModel will
work just fine, it just doesn't support specific cases such as trees.
Change-Id: I59305006540ddc049e276cf412571373cbfa6c67
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Jerome Pasion [Tue, 7 May 2013 10:50:39 +0000 (12:50 +0200)]
Doc: Removed pages from the "qml-features" group.
-This group is from Qt 4 and no longer relevant in Qt 5.
-The \group page in qtdoc is removed.
Change-Id: I6349a9056ae45c98b31c70fd693adecf71e2ba8c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
Jerome Pasion [Mon, 13 May 2013 11:11:05 +0000 (13:11 +0200)]
Doc: Fixed a bunch of missing snippets.
-moved delegate model related snippets from Qt Quick to Qt QML.
-corrected snippet paths
Change-Id: If688f97fb9317def16f343d5502a6a54d6761e95
Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
Topi Reinio [Tue, 14 May 2013 10:41:32 +0000 (12:41 +0200)]
Doc: Define Qt global object as a QML type and fix referring docs
This change adds the Qt global object as a QML type in the Qt QML module
and fixes links to it in documentation.
Task-number: QTBUG-29353
Change-Id: I1690224091a79a3309fac7a78aa0c0c734449e4f
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Friedemann Kleint [Mon, 13 May 2013 13:30:17 +0000 (15:30 +0200)]
Fix warnings in stocqt-example.
Task-number: QTBUG-31083
Change-Id: I97d429c1a30664373478636c6b066dbdcd2a46ee
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Alan Alpert [Mon, 6 May 2013 20:55:40 +0000 (13:55 -0700)]
Changelog entry for ListView behavioural change
Task-number: QTBUG-30555
Change-Id: Idcb0b2457e761f806179f4900ea5b0c9cb811cea
Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
Reviewed-by: Albert Astals Cid <albert.astals@canonical.com>
Jerome Pasion [Mon, 13 May 2013 11:12:33 +0000 (13:12 +0200)]
Doc: fixed some WS issues.
-generated by git-split-ws tool
Change-Id: Icf1e85d01c818396e8dffb9b6aba2c132acfaaa1
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Josh Faust [Sat, 4 May 2013 01:36:19 +0000 (18:36 -0700)]
Fix crash in QQmlApplicationEngine when loading finishes
Task-number: QTBUG-30997
Change-Id: I10cb2c689408d1b31360095c2aa9e0943a5d9452
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Gunnar Sletta [Mon, 13 May 2013 14:02:30 +0000 (16:02 +0200)]
Fix sorting of QSGTextMaskMaterial (native glyph drawing).
It seems we were hitting the bool operator rather than the
pointer values so all text materials, regardless of size
or style would return equal.
Change-Id: I8773e5aa965035f6737920747c2cf073929ff799
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Sérgio Martins [Fri, 10 May 2013 20:14:06 +0000 (21:14 +0100)]
Fix typos in QQuickDrag documentation.
Change-Id: Iab8c537e16e9767ddfd837503a340eb708aa6814
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Liang Qi [Fri, 10 May 2013 09:54:37 +0000 (11:54 +0200)]
Mac: respect the system settings in Full Keyboard Access
Iterate all or not in nextPrevItemInTabFocusChain function.
Change-Id: I95289b042f3d9924c28ffb9c8c7124c767addf2e
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Mitch Curtis [Wed, 8 May 2013 07:55:16 +0000 (09:55 +0200)]
Fix assertion in qt_create_image_data().
Don't compare qreal against int.
Change-Id: Ic8970ed0a21a7d5d0f0ffd0ca37ee49b04f38d6c
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Alan Alpert [Fri, 26 Apr 2013 23:27:21 +0000 (16:27 -0700)]
Don't fix up x/y while initializing
Any initial values leading to content outside the Flickable are likely
to be explicitly set as initial property values. "fixing" them up will
lead to just ignoring them.
Task-number: QTBUG-30837
Change-Id: I3b2593605f16d73ba008bc6a6f067ab6020bcbe4
Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
Alan Alpert [Thu, 2 May 2013 00:30:53 +0000 (17:30 -0700)]
Make QQmlInstantiatorPrivate bools more space efficient
Change-Id: Ie7a4951d66763c55148f02c6c88241c8ad363a90
Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
Friedemann Kleint [Wed, 8 May 2013 08:29:17 +0000 (10:29 +0200)]
Fix MSVC-warning about inconsistent DLL-linkage.
Introduced by
9b5a55101d7c519446c1cf3706a235dea81ad4de .
Task-Number: QTBUG-28572
Change-Id: I5e7d012d22c701b2b15ab288d2c72f177caf904e
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
Liang Qi [Wed, 8 May 2013 15:53:34 +0000 (17:53 +0200)]
Revert "Mac: respect the system settings in Full Keyboard Access"
This breaks Qt Quick Controls activeFocusOnTab autotests.
This reverts commit
305616a60462b668c4d0b3d19302fa90469aceb5.
Change-Id: Ided59ebe99659b23e950e8269ccaa8d7d44a4fdb
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Thomas Hartmann [Tue, 7 May 2013 06:15:29 +0000 (08:15 +0200)]
ChangeLog: Document behavior change for resource property
Change-Id: Id6e157aa191aaa4e24a9cd5c76abfe902fe43d44
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
Kai Koehne [Wed, 8 May 2013 12:16:56 +0000 (14:16 +0200)]
qmlplugindump: Add explanation why it needs to be an app bundle
Since this is popping up quite regularly, add an explanation why
we need qmlplugindump to be an application bundle.
Change-Id: Iacf5ad0742aa9fb601c3be046f268764df062e81
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>