Alan Alpert [Thu, 11 Apr 2013 23:57:19 +0000 (16:57 -0700)]
No longer apply pending changes when accessing ItemView properties
Applying changes in the getters can lead to binding loops, and is
currently inconsistently applied. Removing the applyPendingChanges calls
from remaining getters, and adding a forceLayout() function for cases
where the immediate-apply behavior is needed.
Task-number: QTBUG-30555
Parts-of-patch-by: Albert Astals Cid
Change-Id: I64632601e02f2a53060296ab7739577a749d916f
Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
Reviewed-by: Albert Astals Cid <albert.astals@canonical.com>
Alan Alpert [Fri, 12 Apr 2013 17:30:51 +0000 (10:30 -0700)]
Avoid modifying cacheCount while iterating over it
Because the cache items can be referenced in bindings, the last ref for
the item can be cleared at any time due to JS ownership. This could
modify the cache count while iterating over it. The removal from the
cache list is now postponed until iteration is finished. All iteration
cases can already handle an invalid cache item being found in the list.
Task-number: QTBUG-30555
Change-Id: I1c0721b4d7e0dd69ce7a73824c1aa7b50d2c32a2
Reviewed-by: Albert Astals Cid <albert.astals@canonical.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Gunnar Sletta [Thu, 18 Apr 2013 15:02:24 +0000 (17:02 +0200)]
Implement QQuickWindow::grabWindow() for isVisible=false
Webkit uses this for testing.
Change-Id: I4539e169a02592fb6c0062903917d4dd23a4303c
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Gunnar Sletta [Fri, 26 Apr 2013 12:54:04 +0000 (14:54 +0200)]
Optimize particle mask extruder
Change-Id: Ideed246f49301f826935d3fe4a25a3b593ee6b07
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Frederik Gladhorn [Fri, 26 Apr 2013 14:11:56 +0000 (16:11 +0200)]
Simplify setting of hover
Change-Id: I620dad5a07749a25c97f5c17e8f7f552593cfd2d
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Samuel Rødal [Fri, 26 Apr 2013 10:40:18 +0000 (12:40 +0200)]
Fixed segmentation fault when setting shadowBlur in Canvas element.
Task-number: QTBUG-30882
Change-Id: I6c941394527bac62c0d2792acf5cf223279babc7
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Nico Vertriest [Thu, 25 Apr 2013 11:32:47 +0000 (13:32 +0200)]
Doc: corrections (Writing Guidelines) and language edits
Corrected punctuation issues.
Task-number: QTBUG-30774
Change-Id: I144d2487d4f7c248c60bf824b909145416d356fa
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Shawn Rutledge [Thu, 25 Apr 2013 09:16:40 +0000 (11:16 +0200)]
Re-implemented itemChange must always call QQuickItem::itemChange
Documentation for that fact, and the windowChanged signal.
Fix existing QQuickItem subclasses which didn't call
QQuickItem::itemChange. Examples should rather connect to the
windowChanged() signal.
Change-Id: Ieddcdbe69f849ddb120b64be9c5e0a21393b0ed9
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Morten Johan Sørvig [Wed, 17 Apr 2013 07:04:12 +0000 (09:04 +0200)]
Fix spelling error.
Change-Id: I8f889d9c60cf4ac53fee75001efefc697c8d2076
Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Frederik Gladhorn [Tue, 5 Mar 2013 00:19:42 +0000 (01:19 +0100)]
Implement a basic accessible text interface
Change-Id: Ic8a807f9de66d2d13da1193fe6e2abb7ccccb2a2
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
Albert Astals Cid [Thu, 25 Apr 2013 10:41:44 +0000 (12:41 +0200)]
Initialize lastPos
I was valgrinding a scene with a flickable and i come to see
that in some ocassions we use lastPos before initializing it
in QQuickFlickablePrivate::viewportAxisMoved
Change-Id: Ibfeeefc00f62493163d5d44f676bec79a4c004c2
Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>
Gunnar Sletta [Thu, 25 Apr 2013 10:34:29 +0000 (12:34 +0200)]
Mark the canvas texture dirty when we change it.
Because the texture is the same instance and the rect is the same,
the early-out checks in QSGSimpleTextureNode will abort.
Task-number: QTBUG-30666
Change-Id: I0e6a1fd3d4de33436057e8cdf62dc0e7964b5c21
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Gunnar Sletta [Thu, 25 Apr 2013 11:26:04 +0000 (13:26 +0200)]
Quote scenegraph example code from the right place.
Change-Id: I0eced5b0062aa36dc67b575615ed4c82d3ea6d3d
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Gunnar Sletta [Thu, 25 Apr 2013 13:17:40 +0000 (15:17 +0200)]
Disable native glyph rendering on embedded
Change-Id: I71769affe8f0138dd65f3b94fb27176bd069ab8d
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Nico Vertriest [Thu, 18 Apr 2013 10:07:04 +0000 (12:07 +0200)]
Doc: corrected snippet issue by changing extension snippet file.
Task-number: QTBUG-30746
Changed in deployment.qdoc
Deleted example.qrc
Created example.qdoc
Added license text to example.qdoc
Change-Id: I9699dcdb4977506c0a62d1a9e952c98babfaf03d
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Sze Howe Koh [Wed, 24 Apr 2013 14:31:41 +0000 (22:31 +0800)]
Doc: Expand example (importing multiple modules into 1 namespace)
Snippet is for the Qt QML "Import Statements" page. Show how to use the
namespace to reference types from different modules
Change-Id: I8c49703194a18657439afdef75e47ff7e97be653
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Marco Bubke [Wed, 24 Apr 2013 12:01:20 +0000 (14:01 +0200)]
Make pathElements designer ready
The append and clear case was not handled before but the designer is
changing the pathElements.
Change-Id: I373e26a7c597774c3e985a8c26a564700e9ee9de
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Marco Bubke [Wed, 24 Apr 2013 11:52:10 +0000 (13:52 +0200)]
Refactor the pathElements property in QQuickPath
A prequel to make QQuickPath pathElements designer ready.
Change-Id: I1f3e30c699c958c827fdecfb57c35f5c24cd810a
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Marco Bubke [Wed, 24 Apr 2013 11:26:51 +0000 (13:26 +0200)]
Refactor QQuickPath componentComplete
It is a prequel for the refactoring of the pathElements property.
Change-Id: I56cc4b9b419fecf96e331a6cab58b33157742e70
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Sze Howe Koh [Wed, 24 Apr 2013 14:20:30 +0000 (22:20 +0800)]
Doc: Replace some references to Nokia
Link to internal QDoc pages, or to qt-project.org
Change-Id: I5d9adae711213873ab57ccfc5bb2d8f74cf5689b
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Gunnar Sletta [Tue, 16 Apr 2013 15:25:04 +0000 (17:25 +0200)]
Renderloop for Windows
The normal GUI thread render loop has several problems on windows.
It does not do vsync animations and on some hardware, where the
vsync delta is higher than the time it takes to fire a 16ms timer,
the eventloop will always contain at least one event and we never
return to processing non-client area events, like resize.
Also, threaded OpenGL seems rather unstable, so the threaded renderer
is not a stable option.
So we introduce a windows based renderloop. It is fully cross platform
but written to make the most out of the limitations which exist.
The overall goal is:
- vsync animations when allowed by the system. We get this by
using an animation driver and advancing in sync with rendering
- Keep system load low and allow for NC processing. The maybeUpdate
function will start a short timer which will let the renderloop
idle for few ms, allowing the eventloop to pick up system events.
(this is similar to what the threaded renderer also does, btw)
Change-Id: Ic192fd0ed7d5ecdaa2c887c08cbeb42c5de6b8a8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Janne Anttila [Wed, 24 Apr 2013 09:00:54 +0000 (12:00 +0300)]
Fix tst_qqmldebugjs and tst_qquickfolderlistmodel build for WinCE.
tst_qqmldebugjs:
Some WINCE header files define IN and OUT macros, and those make
the following assignments in tst_qqmldebugjs.cpp to fail later on:
const char *IN = "in"
const char *OUT = "out"
Since platform macros are not needed in the context of this file,
undef them to make build pass for WinCE.
tst_qquickfolderlistmodel:
WinCE does nothave drive letter concept, so lets execute the
changeDrive test only on desktop Windows.
Change-Id: I5c159e3b3ee82e888aeac1da559fd63a875d089e
Reviewed-by: Björn Breitmeyer <bjoern.breitmeyer@kdab.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Sze Howe Koh [Mon, 22 Apr 2013 11:49:30 +0000 (19:49 +0800)]
Doc: Un-overload the word "module"
"The Qt Quick module contains the QtQuick QML module and the Qt Quick
C++ module" is an odd way to describe things.
The concept of a "QML module" is deeply entrenched so this patch won't
touch it, but at least we can get rid of references to "C++ module"s.
Change-Id: Ib06f8e3152551901dc6016cb37507cb9608d7863
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Sze Howe Koh [Fri, 19 Apr 2013 17:14:53 +0000 (01:14 +0800)]
Doc: Create links to Qt Quick 1
Point to the porting guide, so that users who search for the old names
will be directed to an explanation of the name change.
Also made some new links to Qt Quick 2, and changed "favour" -> "favor"
(Sanity Bot complained)
Change-Id: If30c8d619d8fdb9df72b7b5f3efd356f1e07b23a
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Pierre Rossi [Mon, 25 Mar 2013 15:52:45 +0000 (16:52 +0100)]
QQuickTextEdit: make the update logic work with multiple text frames
We can't assume that the text nodes are added in order since we're
iterating over all the blocks of a text frame before processing its child
text frames. The only way for all this not to collapse is to sort the text
nodes once we're done each time we're replacing/adding new ones.
Task-number: QTBUG-30349
Change-Id: Ia5d804f7f196b2348fd68fdd62a6585c189baaa4
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>
Fawzi Mohamed [Wed, 24 Apr 2013 08:46:22 +0000 (10:46 +0200)]
qtdeclarative: update .qmltypes, and use -notrelocatable option
this should fix some bugs in the code support due to incorrec/outdated
meta info
Change-Id: I90925daa5376ebdfb9a6f9d73103893065c15d64
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Fawzi Mohamed [Tue, 23 Apr 2013 17:03:14 +0000 (19:03 +0200)]
qmlplugindump: add an explicit -relocatable switch
this will enable us to switch the default to nonrelocatable
Change-Id: Ic4bff6466ee2fb6d4d1dd89829034ad239422a7e
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Sze Howe Koh [Tue, 23 Apr 2013 14:15:47 +0000 (22:15 +0800)]
Doc: Fix module name format
Follow the conventions at
http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation
Qt3D -> Qt 3D
QtLocation -> Qt Location
QtScript -> Qt Script
Change-Id: Id59cb209e0e0407d564de0bfaab73990e64a02e6
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Sze Howe Koh [Fri, 19 Apr 2013 16:33:27 +0000 (00:33 +0800)]
Doc: Fix module name format
Follow the conventions at
http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation
QtGui -> Qt GUI
QtMultimedia -> Qt Multimedia
QtScript -> Qt Script
QtSensors -> Qt Sensors
QtSvg -> Qt SVG
QtWebkit -> Qt WebKit
Also fix a broken link to "Qt WebKit QML Types"
Change-Id: Ica6081024d3957a3ca2ef3d870f623506c69d877
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Sze Howe Koh [Tue, 23 Apr 2013 14:19:05 +0000 (22:19 +0800)]
Doc: Qt Quick: Fix module name format (Pt 2/2)
Follow the conventions at
http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation
Attempt to differentiate between the whole module ("Qt Quick") and the
QML import ("QtQuick") by encoding the latter with monospace font. There
are places in the text where both representations are valid.
Change-Id: If398304757e0a5106542c09099e1814084e54c5c
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Sze Howe Koh [Wed, 17 Apr 2013 15:03:16 +0000 (23:03 +0800)]
Doc: Qt Quick: Fix module name format (Pt 1/2)
Follow the conventions at
http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation
Attempt to differentiate between the whole module ("Qt Quick") and the
QML import ("QtQuick") by encoding the latter with monospace font. There
are places in the text where both representations are valid.
Change-Id: Id6e157a4191aaa4e23a9cd5c76abfe902fe43d33
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Jerome Pasion [Tue, 23 Apr 2013 13:50:20 +0000 (15:50 +0200)]
Doc: Reinstating \qmlmodule page.
Was removed in an earlier commit.
Change-Id: I1fdaf6c7e1e522f6ba7e36a20040b8222b1714cc
Reviewed-by: Martin Smith <martin.smith@digia.com>
Gunnar Sletta [Thu, 7 Mar 2013 09:20:19 +0000 (10:20 +0100)]
Create BG context and fake surface on GUI thread
This makes the example more messy and also makes it very hard
to avoid the initial black frame, but it is not compliant with
the limitations we experience on Windows.
Task-number: QTBUG-30077
Change-Id: If5a6da16f8fc1269cd20d2aa1190588025203d4f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Kai Koehne [Tue, 23 Apr 2013 09:49:36 +0000 (11:49 +0200)]
Debugger: fix race condition in block mode
Make sure that the GUI thread & debugger thread actually sync on startup. So far
the GUI thread would block forever in waitCondition.wait() if the debugger thread
spawns & receives the HELLO before.
Also remove unused code and rename variables to make their use more obvious.
Change-Id: I8285e8860667496d491807e696535353d9f14dea
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
Aurindam Jana [Tue, 23 Apr 2013 11:44:41 +0000 (13:44 +0200)]
V8Debugging: Set Isolate when sending debug messages to v8
Pass the Isolate used for setting the DebugMessageDispatchHandler
to SendDebugMessage. This is to ensure that the proper dispatch
handler is called since the Debugger is per Isolate.
Change-Id: I4497155b90d4b678a5c4116859269892441ce70e
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Gunnar Sletta [Mon, 22 Apr 2013 11:41:53 +0000 (13:41 +0200)]
Clear the pendingUpdate flag every frame.
Change-Id: Icd9bf8ec63e46341f5a43dbb85fe6a3a885f6afb
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Jerome Pasion [Wed, 17 Apr 2013 15:19:35 +0000 (17:19 +0200)]
Doc: Refactored and focused the Qt QML documentation.
Before it wasn't clear to what the module provided, especially
with the coupling of Qt QML and Qt Quick.
The doc is centered around these documentation:
-QML refernce: the language syntax and the application constructs
-JavaScript environment: the environment provided by the module
-Integration with C++: more about the engine and the C++ API
-QML Types and Classes reference (created by \qmlmodule and \module)
The distinction are made in the directory and the section titles in
the Qt QML landing page.
Change-Id: I033bfcbf8368b94ffa5ee4b1225bee74347f53eb
Reviewed-by: Martin Smith <martin.smith@digia.com>
Gunnar Sletta [Tue, 23 Apr 2013 10:32:01 +0000 (12:32 +0200)]
Use the actual size of the image for the iteration.
If the rectangle dimension was a floating-point value, we could
sample outside the image, causing tons of warnings.
Change-Id: I10abece9a6b0cf769551f554fb5999d5d90e4c9d
Reviewed-by: aavit <eirik.aavitsland@digia.com>
Mitch Curtis [Wed, 13 Mar 2013 13:34:51 +0000 (14:34 +0100)]
Use the platform theme's password mask character for text input fields.
Task-number: QTBUG-29871
Change-Id: I3b15dfab5ca6455df465c502c93aac7b85a64531
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Thomas Hartmann [Tue, 23 Apr 2013 07:25:29 +0000 (09:25 +0200)]
Adding emitComponentCompleteSignalForAttachedProperty()
Each item that is created by a component gets the
attached property "Component".
This property has the signal onCompleted.
This function allows the designer to manually emit this
signal once the item is setup.
I had to export QQmlComponentAttached for this.
Change-Id: I45b4e72af4f12cdcda29f165cc9bc4d9dee8faf7
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Liang Qi [Fri, 12 Apr 2013 09:52:48 +0000 (11:52 +0200)]
Expose nextItemInFocusChain in QQuickItem
Convenient for other use cases related with tab focus chain.
Autotest is included.
Change-Id: I1ba6317e20edacc2b672bc5b78e3fcd29ac80bdc
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
Frederik Gladhorn [Tue, 23 Apr 2013 08:04:28 +0000 (10:04 +0200)]
TextInput: Fix cursor navigation with mask
text().length() was used to check if a cursor movement
to the right was valid. The problem is that with a mask and
not text set yet (inputMask: "#0:00;*") pressing the right
arrow would not move the cursor.
The input and other functions use the actual d->m_text
since that includes the mask length.
Task-number: QTBUG-30740
Change-Id: Ic225778e5a49d80b754b63d0eb4a438eaa9818e2
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Samuel Rødal [Tue, 23 Apr 2013 07:38:19 +0000 (09:38 +0200)]
Fixed crash in QQuickCanvasItem.
The d->contextInitialized variable is useless as it gets out of sync
with d->context when the latter is set to 0. Simply checking that
d->context is non-null fixes some crashes.
Task-number: QTBUG-30810
Change-Id: I474a807a402396b170ba45ae7546781eea92b481
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Friedemann Kleint [Mon, 22 Apr 2013 14:39:34 +0000 (16:39 +0200)]
Fix lupdate-warning "Cannot invoke tr() like this".
Change-Id: I3ded3d9ab9fa202a3133c53fd6e17a8354481d0c
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Mitch Curtis [Thu, 18 Apr 2013 09:20:57 +0000 (11:20 +0200)]
Prevent segfault on trying to access null cacheItem object.
In the situation mentioned in the bug report, a segfault occurs in
QQmlDelegateModelPrivate::incubatorStatusChanged. This
happens because cacheItem's object member is null but is still accessed
several times. This patch adds a check for null before operating on the
pointer.
Task-number: QTBUG-29727
Change-Id: Ia4c0699442c6d0f50e090b401a58ed06c69b351a
Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
Thomas Hartmann [Thu, 18 Apr 2013 14:09:08 +0000 (16:09 +0200)]
Allow disabling of component complete signal for the designer
We emit the signal later in the designer.
Change-Id: I5da4a2234467444446f168888a3ad3682f4ccc22
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Sze Howe Koh [Wed, 17 Apr 2013 15:03:16 +0000 (23:03 +0800)]
Doc: Qt QML: Fix module name format
Follow the conventions at
http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation
QtQml -> Qt QML
Change-Id: I45ca4496a02214feab48707b026c6bec085df138
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Sergio Ahumada [Fri, 19 Apr 2013 10:19:53 +0000 (12:19 +0200)]
docs: Fix snippets paths for QML Tutorial
This seems to be a leftover from
1a23fbc59a1389677b3f232379f441ed5b4cdf90
Task-number: QTBUG-28898
Change-Id: I7adcb6a3f05a4fed08ff73b522a042b1ad9cee1e
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Frederik Gladhorn [Wed, 17 Apr 2013 11:44:40 +0000 (13:44 +0200)]
Fix crash in repeater when model gets deleted
Task-number: QTBUG-200461
Change-Id: Ia8e48668960ac005cf773bf6f53da40f1c753b9b
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Frederik Gladhorn [Wed, 17 Apr 2013 09:14:12 +0000 (11:14 +0200)]
docs: Remove warning that is no longer applicable.
Change-Id: I1d7359b48ab4bb6001171901ab55d4c5030fb1f9
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
Thomas Hartmann [Thu, 18 Apr 2013 08:16:13 +0000 (10:16 +0200)]
Dumping plugins.qmltypes for Window with -notrelocatable
The code model needs this option.
Change-Id: I5daaa222c467444446f168888a3ad3682f42cc20
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Friedemann Kleint [Wed, 17 Apr 2013 11:54:49 +0000 (13:54 +0200)]
Fix crash on empty child list in QAccessibleQuickWindow::rootItem().
Change-Id: I07f1482216c3147bf851046e61a56ec74f074dea
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
Morten Johan Sørvig [Wed, 17 Apr 2013 06:43:17 +0000 (08:43 +0200)]
Restore checkbox toggling on pressAction.
Looks like this was accidentally removed by the
check/uncheck->toggle replacement (
4ac33a52).
Change-Id: I7f8742bd4c53fba52ab3460348221570dc17aeb7
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Jerome Pasion [Tue, 9 Apr 2013 10:08:44 +0000 (12:08 +0200)]
Doc: Reassigned types and pages to their correct modules.
1)Moved classes and basic types to \module QtQml 2.
-QQml* classes are in QtQml 2 for 5.1
2)Removed \inqmlmodule commands in overviews and tutorials.
-Only QML API should have \inqmlmodule commands because they are added
to the auto generated list of types.
Change-Id: I9aa3ca8062fa9fed76734885829879122841b119
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Pierre Rossi [Thu, 11 Apr 2013 13:00:48 +0000 (15:00 +0200)]
Silence a warning for unused variable in QQuickTextNode.
While refactoring it seems the position was forgotten.
As it is exposed in addTextLayout, we should try to pass
it along when initializing the selection engine.
Task-number: QTBUG-30338
Change-Id: Id8d9221efe0027315ba1d48c47c9ea2ecd8d7561
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Jerome Pasion [Wed, 17 Apr 2013 12:40:11 +0000 (14:40 +0200)]
Doc: Fixed whitespace in qqmlcomponent.cpp
-Done by the split-ws tool.
Change-Id: I9d1af670fadcbfdaa2f40c33c11e48fee96f0b0a
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Gunnar Sletta [Tue, 16 Apr 2013 10:29:52 +0000 (12:29 +0200)]
Don't use bitfields, reading/wrting them is not atomic
Task-number: QTBUG-30663
Change-Id: I952bb4cd9c254f085304ceeddced14b66e0f12b6
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Gunnar Sletta [Tue, 16 Apr 2013 08:51:31 +0000 (10:51 +0200)]
Remove dead code.
The renderWithoutShowing was a piece of functionality that we
experimented on long ago and it never quite worked and has
it currently only adds bloat.
It would be sensible to be able to render a window without showing
it on screen, such as for testing purposes, but then it should
be done through proper public API and thouroughly supported
cross platform.
Change-Id: I6bea7335f769c038a8167bad77c2dba171359be9
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Yoann Lopes [Tue, 16 Apr 2013 14:29:21 +0000 (16:29 +0200)]
Fixed alpha blending for native text.
Change-Id: I3effd31849b21a9497fadfb22c959562bff7951b
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Filip Piechocki [Tue, 2 Apr 2013 10:48:22 +0000 (12:48 +0200)]
Fix for Positioner attached property
Modified Positioner attached properties update - original code was trying to update visible and not visible items
by looking only at the positionedItems array, which was wrong as that array contains only visible items. Hidden
ones are stored in unpositionedItems array so second loop was added to affect these items also.
Task-number: QTBUG-30477
Change-Id: If03abb76f4da708884a7e2cf6ade83c09eca45bf
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Aurindam Jana [Mon, 15 Apr 2013 15:27:24 +0000 (17:27 +0200)]
QmlDebugging: Auto tests use port range
Change-Id: I715f50a696283d2a2af0f54409de02289637bf78
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Gunnar Sletta [Tue, 16 Apr 2013 08:36:05 +0000 (10:36 +0200)]
fix typo in warning
Change-Id: I5f70ad30b9b1ba6551c9c8c76b87c2f3f2ea8aa9
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
Gabriel de Dietrich [Tue, 9 Apr 2013 12:46:04 +0000 (14:46 +0200)]
TextInput: Fix cursor height
On many platforms, the current cursor looks too tall. The logic used
in this patch is inspired by what we have in QTextLayout::drawCursor().
It still looks too tall on Mac, but so it does in Qt Widgets.
QQuickTextInput::positionToRectangle() has also been updated for consistency.
Change-Id: I69b8ad246238d54db370db639a319a3edba6d78a
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Topi Reinio [Tue, 16 Apr 2013 10:15:30 +0000 (12:15 +0200)]
Doc: Add required include statement for qmlRegisterSingletonType docs
Adds a missing include for QtQml into QQmlEngine class reference code
snippets.
Task-number: QTBUG-30642
Change-Id: I2ec10de5b31b4854d5aaea08987b9d75926d2ef4
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Bjoern Breitmeyer [Thu, 11 Apr 2013 15:07:39 +0000 (17:07 +0200)]
Fixed WindowsCE build
A windows header is included before the include
of the v8 debug header and it has a define for
DebugBreak which breaks linking of declarative on
WinCE
Change-Id: I9178cfcb960c0acbc850f2ff80c6d73b761c04f0
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
Gunnar Sletta [Thu, 11 Apr 2013 12:20:57 +0000 (14:20 +0200)]
Use triangle strips for particles on Mac OS X, ATI cards.
Change-Id: Ie831fc6f8f8cdd891c15dc028383b191662416fc
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Paul Olav Tvete [Fri, 12 Apr 2013 14:24:47 +0000 (16:24 +0200)]
Remove slow and buggy sub-image code
The code was probably sub-optimal in most cases, and it broke on
GLES 2 when using the BGRA texture extension.
Done with Gunnar.
Task-number: QTBUG-30656
Change-Id: I92f74cd39f408f145629bc0eb6f3ff43d2f4f000
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Aurindam Jana [Mon, 15 Apr 2013 08:52:25 +0000 (10:52 +0200)]
QmlDebugServer: Remove unimplemented function
Change-Id: I926d876fe841ce3f3a000c865c74169861f17221
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Aurindam Jana [Mon, 15 Apr 2013 08:53:10 +0000 (10:53 +0200)]
QmlDebugServer: Ensure plugin is set
Change-Id: Ibc0e5ed626edc076e96c4848994ba0cafba0f5c6
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Aurindam Jana [Mon, 15 Apr 2013 15:56:54 +0000 (17:56 +0200)]
Revert "QmlDebugging: Remove 'insignificant_test'"
This reverts commit
c4b4b01d8ea708f7a1c4cb5adaed8f4abdc623a3.
The testcase is still flaky on OSX.
Change-Id: I6970b681c3172f7074c00b38c3362d5f212392ab
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Alan Alpert [Thu, 11 Apr 2013 20:35:24 +0000 (13:35 -0700)]
Don't relayout if item is removed from scene
Task-number: QTBUG-28160
Change-Id: I208f213e2de6b530dd0965b301d046aee0182d9a
Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
Fawzi Mohamed [Wed, 10 Apr 2013 09:26:16 +0000 (11:26 +0200)]
qmlplugindump: always output exportMetaObjectRevisions
Some people were confused about exportMetaObjectRevisions, and
the "all 0" as default was not expected.
Make it explicit so we might change the default in the future.
Change-Id: I1f208ba54e2b9aa1a5d46fb9971572467b69ab56
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Frederik Gladhorn [Fri, 12 Apr 2013 14:34:31 +0000 (16:34 +0200)]
Improve focus documentation
Change-Id: I4e9fc98fcc0cc5adabb673903d0058eb9ac9a1e6
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Caroline Chao [Wed, 10 Apr 2013 09:32:10 +0000 (11:32 +0200)]
Testlib: Fix qml objects not deleted in TestCase
After destroy() been called in the test function.
wait(0) is used to call processEvents().
Task-number: QTBUG-30523
Change-Id: I208f213e2de6b530dd0965b301d046aee0182d9b
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
Caroline Chao [Fri, 22 Mar 2013 10:03:46 +0000 (11:03 +0100)]
Doc: Add a link to the Qt Quick Controls page
From the Qt Quick main page.
Change-Id: Iaea46afe0f6a795cb33ec53a7b767461ce42d3df
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Nico Vertriest <nico.vertriest@digia.com>
Thomas Hartmann [Tue, 9 Apr 2013 10:54:09 +0000 (12:54 +0200)]
DesignerSupport: Adding separate flag for component completion
The designer should only disable completion of components
if the component is created directly by the designer.
Change-Id: Id86d2b2f2e61355240bdbbb7875db3e97fb0da17
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Alan Alpert [Wed, 10 Apr 2013 21:18:46 +0000 (14:18 -0700)]
Stabilize Test
Use QProcess::waitForFinished over a signal spy. Has a
chance of stabilizing the test, but also cleans up the code.
Change-Id: I888c3b9da6d44d11516227c085bcc12a5ccb5e8a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Shawn Rutledge [Wed, 27 Mar 2013 08:57:59 +0000 (09:57 +0100)]
a nested Window automatically becomes transient for its parent
If you declare Window { Window {}} or Window { Item { Window {}}}
the inner window will automatically become transient for the
outer one. The transient relationship must be set before the
inner window becomes visible though, so declaring visible: true
doesn't always work, depending on initialization order. It's OK
if you assign visible (or call show()) later on when the user needs
to see the transient window for the first time.
Also added documentation.
Change-Id: I888c3b9da6d44d11516227c085bcc12a5ccb5e81
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
Liang Qi [Tue, 9 Apr 2013 10:09:24 +0000 (12:09 +0200)]
Added more tests for activeFocusOnTab
The ignored key events will go to parent.
Change-Id: I5e002ee9df44d1c7865c1c50a1631e8e206c68af
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
Thiago Macieira [Sat, 6 Apr 2013 18:35:00 +0000 (11:35 -0700)]
Fix new warnings in qtdeclarative (found by GCC 4.8)
qqmlproperty.cpp:1561:35: warning: typedef ‘VMEMO’ locally defined but not used [-Wunused-local-typedefs]
qquickglobal.cpp:1017:13: warning: ‘initialized’ defined but not used [-Wunused-variable]
qquicktextnode.cpp:245:6: warning: unused parameter ‘position’ [-Wunused-parameter]
Change-Id: I48c5486953278dc960249f68e0e122d108f56e07
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Liang Qi [Fri, 5 Apr 2013 13:39:59 +0000 (15:39 +0200)]
Version new property and signal
activeFocusOnTab and activeFocusOnTabChanged in QQuickItem.
Task-number: QTBUG-30446
Change-Id: I973df95d690b8e533b5cc108d8e083a2fed8528a
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Sergio Ahumada [Mon, 8 Apr 2013 09:21:25 +0000 (11:21 +0200)]
Add change log file for Qt 5.1.0
Change-Id: I9bd3fe3cb3897c18b08a3f9d4792f69a29d9d5f9
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Aurindam Jana [Tue, 19 Mar 2013 12:41:34 +0000 (13:41 +0100)]
QmlDebugging: Remove 'insignificant_test'
The test cases used to depend on a specific port being free for
client-server communication. Since, the test cases now use a port
range, they should be more stable now. The timeout has also been
increased from 5s to 10s to ensure that the application output
is read.
Task-number: QTBUG-28263
Change-Id: I7f0670713b8a901e4da3c3d62bbb9fc18e38bd25
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Yoann Lopes [Thu, 21 Mar 2013 15:34:38 +0000 (16:34 +0100)]
Fixed distance field text when using non-opaque colors.
The alpha has to be premultiplied before passing the color to the
shader.
Change-Id: If22f0e0892eb4330d5f7398bea2710fce18c4dcb
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Caroline Chao [Tue, 2 Apr 2013 16:24:46 +0000 (18:24 +0200)]
TestLib: Add more mouseMove in mouseDrag implementation
So the cursor has intermediate states while dragging instead of
jumping to the final position.
This is for example useful for testing the behavior of a control
during the drag.
Add autotest.
Change-Id: I061dd18ef7ac389aa4da4a5b60f9e128ee8c08d0
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Yoann Lopes [Thu, 21 Mar 2013 17:22:09 +0000 (18:22 +0100)]
Use correct alpha range for the distance field outlined text.
The alpha treshold values used in the outline shader were hard-coded. It
should use the same logic as in the normal text shader, using the
ThresholdFunc and the AntialiasingSpreadFunc for calculating these
values.
Change-Id: I0e6f38644692cc7a8a4cee1e8e60622fe289d615
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Frederik Gladhorn [Fri, 5 Apr 2013 14:01:51 +0000 (16:01 +0200)]
Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable
Yoann Lopes [Tue, 12 Mar 2013 17:43:21 +0000 (18:43 +0100)]
Implemented text styles for QSGDefaultGlyphNode.
Used when Text has renderType: Text.NativeRendering.
Task-number: QTBUG-27867
Change-Id: Id1262ef49e26229c86ebd2533b9f6de638bc75cb
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Albert Astals Cid [Wed, 3 Apr 2013 09:07:18 +0000 (11:07 +0200)]
Make keyClick/Press/Release work with a char
Change-Id: Id821bddd993d4da4458464713a69edfea4aaecaa
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Eskil Abrahamsen Blomfeldt [Thu, 4 Apr 2013 14:17:35 +0000 (16:17 +0200)]
Android: Support implicit import paths for assets:/ urls
The assets: scheme is not handled by QNetworkAccessManager, so it needs
to be special cased along side the qrc: scheme. We make QML recognize
it as a synchronously loaded, local file, and we make the type loader
get the correct path and check existence of the directory correctly.
This makes it possible to implicitly import the containing directory
of QML files that are bundled in the assets directory.
Task-number: QTBUG-30510
Change-Id: I048292757e509066a4af342081ec8428e2bd8af3
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Frederik Gladhorn [Thu, 4 Apr 2013 12:33:04 +0000 (14:33 +0200)]
Remove unused declaration of accessibility text functions.
Change-Id: I5cf9849f5c1ea39954050292d29db9cb1bd78c0c
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
Caroline Chao [Wed, 27 Mar 2013 12:13:30 +0000 (13:13 +0100)]
TestLib: add mouse release at the end of a mouseDrag
Change-Id: I901f23a2bc7089784ed644a53a3712669b21f417
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Thiago Macieira [Tue, 2 Apr 2013 05:45:28 +0000 (22:45 -0700)]
Fix autotest-exported class from QtQuick.
Each class with a virtual table should have at least one non-inline
member. Especially if it's exported (there's no point in exporting it
otherwise).
Change-Id: I6b2821faa9662c6e8b65ce9ced53332e1a18e8d9
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Gunnar Sletta [Mon, 18 Mar 2013 12:22:54 +0000 (13:22 +0100)]
Remove the APPLE_texture_format path
It is untested and is causing problems elsewhere.
Change-Id: I412f820d14c1632e3d1000b627231d8f78e792b5
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Gunnar Sletta [Thu, 21 Feb 2013 10:16:58 +0000 (11:16 +0100)]
Remove resize hook from QSGRenderLoop, exposureChanged is enough.
After much back and forth, I think we have settled on the right approach
in QtGui, which is that resizeEvent is pretty much useless as the
action happens on the following exposeEvent().
Change-Id: I5e87bda89853907d041f56acf9a2895e540c41f0
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Gunnar Sletta [Thu, 4 Apr 2013 07:39:03 +0000 (09:39 +0200)]
Our debug env vars are a mess. Standardize on QSG_RENDER_TIMING
Change-Id: I4e88b479a8a9a5126312a05800e8170511b1f7ac
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Pierre Rossi [Thu, 21 Mar 2013 12:15:01 +0000 (13:15 +0100)]
QQuickTextEdit: render inline images after change 48798
The refactoring in QQuickTextEdit from this change:
https://codereview.qt-project.org/#change,48798
accidentally broke rendering of inline images.
Revive the ProtectedLayoutAccessor trick to get the proper
format and properly extract the image from it.
Change-Id: I445914efcea1012daa79d594aa1e828b1039b988
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Shawn Rutledge [Thu, 4 Apr 2013 13:02:58 +0000 (15:02 +0200)]
Mark tst_dialogs insignificant to stop geting CI failures
Task-number: QTBUG-30513
Change-Id: I625ff99e2e2e31b58fd219cf9736f262098d2664
Reviewed-by: David Faure (KDE) <faure@kde.org>
Frederik Gladhorn [Wed, 3 Apr 2013 14:16:08 +0000 (16:16 +0200)]
Merge remote-tracking branch 'origin/release' into stable
Conflicts:
examples/qml/xmlhttprequest/doc/src/xmlhttprequest.qdoc
examples/quick/accessibility/doc/src/accessibility.qdoc
examples/quick/animation/doc/src/animation.qdoc
examples/quick/canvas/doc/src/canvas.qdoc
examples/quick/draganddrop/doc/src/draganddrop.qdoc
examples/quick/imageelements/doc/src/imageelements.qdoc
examples/quick/keyinteraction/doc/src/keyinteraction.qdoc
examples/quick/localstorage/doc/src/localstorage.qdoc
examples/quick/mousearea/doc/src/mousearea.qdoc
examples/quick/particles/affectors/doc/src/affectors.qdoc
examples/quick/particles/customparticle/doc/src/customparticle.qdoc
examples/quick/particles/emitters/doc/src/emitters.qdoc
examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc
examples/quick/particles/system/doc/src/system.qdoc
examples/quick/positioners/doc/src/positioners.qdoc
examples/quick/righttoleft/doc/src/righttoleft.qdoc
examples/quick/scenegraph/customgeometry/doc/src/customgeometry.qdoc
examples/quick/scenegraph/openglunderqml/doc/src/openglunderqml.qdoc
examples/quick/scenegraph/simplematerial/doc/src/simplematerial.qdoc
examples/quick/threading/doc/src/threading.qdoc
examples/quick/touchinteraction/doc/src/touchinteraction.qdoc
examples/quick/views/doc/src/views.qdoc
Change-Id: Idf7bb76c82acacf86b19a9f4633c3cbf4ae1a9a0
Thiago Macieira [Tue, 2 Apr 2013 05:44:32 +0000 (22:44 -0700)]
Fix export macros for the QML parser export.
These classes are in the QtQml library. They shouldn't be defined to
export (even if it's autotest export) when compiling other libraries,
notably QtQuick.
Change-Id: Id76d2b2f2c60355240edabb7875db3e97fb0da17
Reviewed-by: Alan Alpert <aalpert@blackberry.com>