Friedemann Kleint [Fri, 30 Aug 2013 08:01:15 +0000 (10:01 +0200)]
tst_qquickpathview::cancelDrag(): Move mouse after setUrl().
Take correct window size into account.
Task-number: QTBUG-32662
Change-Id: Ie04c8fe8e254d232f076e6f9d9d0d96f12a4530f
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Gunnar Sletta [Wed, 28 Aug 2013 07:04:15 +0000 (09:04 +0200)]
Initialize variables in ShaderEffectSource's texture provider.
Change-Id: I3d737b923ee0282f58d7a2ee96824f184469daf5
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Simon Hausmann [Mon, 26 Aug 2013 13:35:19 +0000 (15:35 +0200)]
Fix crash when trying to set versioned group properties
If a property isn't available due to revisioning, we print an error message.
Producing the error message should be done with care of obj->type being -1
to avoid out-of-bounds on the output->types array.
Task-number: QTBUG-33179
Change-Id: I7bd420f2dfa0ca2d616340a68999d58022974435
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Yoann Lopes [Wed, 21 Aug 2013 12:40:01 +0000 (14:40 +0200)]
Updated distance field glyph caches to use QDistanceField.
Some OpenGL drivers assume alpha-only images are always tightly packed,
regardless of what is set for GL_UNPACK_ALIGNMENT. We now use
QDistanceField to store glyphs, which aligns scanlines on a 1-byte
boundary, instead of QImage which uses a 4-byte boundary. A previous
workaround uploaded scanlines one at a time, but this is also broken
with some other drivers...
Task-number: QTBUG-30908
Task-number: QTBUG-32861
Change-Id: I46527fb48de1e00116f776427c45baa752c6176d
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Shawn Rutledge [Tue, 27 Aug 2013 11:36:36 +0000 (13:36 +0200)]
Don't crash due to KeyRelease on an unloaded Item
Task-number: QTBUG-33127
Change-Id: Ie0c28abdb32c3b2318f934d3d2ddf459329384a2
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Eskil Abrahamsen Blomfeldt [Fri, 23 Aug 2013 08:31:22 +0000 (10:31 +0200)]
Fix girth of native text with grayscale AA or style
When using a grayscale glyph cache, the source data should be
interpreted differently, like in the OpenGL paint engine. We
should not do srgb gamma correction and we should use the default
blend mode. This also fixes styled text, since that will always
default to a grayscale glyph cache.
This patch ensures:
1. That we detect when the font requires grayscale AA (e.g. when
font smoothing is turned off in the OS)
2. That we interpret the source data correctly.
Task-number: QTBUG-31720
Change-Id: I600f4a28cd443caa0a8d5544d219b47436cde693
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Friedemann Kleint [Mon, 26 Aug 2013 14:24:06 +0000 (16:24 +0200)]
Fix warning about unused variable.
Change-Id: I29f5b2b890f561bc97749d19c0c5f461511c7637
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Daiwei Li [Sun, 25 Aug 2013 05:23:10 +0000 (22:23 -0700)]
Explicitly call setCursor in the QQuickMouseArea constructor
QQuickItemPrivate has a boolean hasCursor that is used by QQuickWindow
to determine whether to use the cursor for an item. QQuickMouseArea has
a default cursorShape of Qt.ArrowCursor that is ignored due to hasCursor
not being set. Thus, call setCursor in the QQuickMouseArea constructor
to sync the cursor state of the QQuickItem and the MouseArea.
Task-number: QTBUG-33157
Change-Id: I56402564bd72bdc89d6ef8e5bc75bfd07c096202
Reviewed-by: Josh Faust <jfaust@suitabletech.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Friedemann Kleint [Fri, 23 Aug 2013 11:35:00 +0000 (13:35 +0200)]
Stabilize tests using utilities from QQuickViewTestUtil.
Change QQuickViewTestUtil::createView() to center the window on
the screen to avoid taskbar areas. Add routine to move the mouse
away and use that in tests using QQuickViewTestUtil::flick()
and other mouse interaction since the mouse cursor can interfere
with it. Affected tests: qquickgridview, qquickpathview,
qquickflickable, qquicklistview, qquickrepeater and qquickpositioners.
Task-number: QTBUG-33017
Change-Id: I540c0efb54a231dcb44c8fd5ad9573a2d4d4b9df
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Friedemann Kleint [Fri, 23 Aug 2013 08:38:08 +0000 (10:38 +0200)]
Stabilize tst_qquickmousearea.
Replace createView() by initView(), instantiate windows on stack or
use QScopedPointer. Center view in available geometry and make
sure the mouse cursor is outside, since otherwise it can
interfere with drag->active(). Remove insignification
introduced by
c1fbee270f50c44f47d4eb287765ad60f362c87a .
Task-number: QTBUG-33006
Change-Id: I8fc661444bc42899dfa3d87887c594270483e508
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Michael Zanetti [Thu, 22 Aug 2013 22:27:05 +0000 (00:27 +0200)]
fix include guard to not clash with qscriptvalueiterator
Change-Id: Ifb51ed15c93ed68e2a18edd4cda4a921f7e41c34
Reviewed-by: Albert Astals Cid <albert.astals@canonical.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Friedemann Kleint [Thu, 22 Aug 2013 11:56:22 +0000 (13:56 +0200)]
tst_qquickitem: Make exclusion more fine-grained.
Revert
764bd1cb0f8f2db4f84018890b9ebb8b42741789 .
Task-number: QTBUG-32664
Change-Id: Idbe476a3e34b584b12e653f23a36d58028a2bf21
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Kai Koehne [Wed, 21 Aug 2013 10:30:46 +0000 (12:30 +0200)]
Debugger: Fix crash when app exits while debugging
Make sure we don't access an already deleted v8engine any more.
Task-number: QTBUG-33100
Change-Id: Ic517577ae30b41375cbf9f787cfe0a29121171e2
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
Josh Faust [Wed, 14 Aug 2013 05:23:39 +0000 (23:23 -0600)]
Fix some style issues in tst_qquickwindow
Change-Id: I5802f10f9aaff3e443696644d07203160fbc3b91
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Martin Jones [Mon, 12 Aug 2013 03:28:17 +0000 (13:28 +1000)]
Dragging MouseArea nested in Flickable does not work with touch to mouse
A MouseArea with a drag target nested in a Flickable does not work.
This is due to QQuickWindow calling childMouseEventFilter() twice -
once in sendFilteredTouchEvent() and later in sendEvent().
Since childMouseEventFilter() has already been called, deliver the
mouse event directly in sendFilteredTouchEvent().
Task-number: QTBUG-32920
Change-Id: I22acee3c66ee6c06e71c9c876fb02dbcb6119a8d
Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
Alan Alpert [Wed, 14 Aug 2013 22:06:50 +0000 (15:06 -0700)]
Doc fix
Grammar and word choice
Change-Id: If736f1d7a6f6396101924c9357c5235605b80b43
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Nils Jeisecke [Tue, 6 Aug 2013 11:58:15 +0000 (13:58 +0200)]
Fix currentIndex in Qml itemView when assigning an empty model
When assigning an empty model to e.g. a ListView after component
initialization has been completed, currentIndex is now correctly
set to -1.
Change-Id: I540c034944009ccb8894bf84f400658ef9f0371f
Task-number: QTBUG-32838
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Simo Fält [Fri, 16 Aug 2013 08:58:05 +0000 (11:58 +0300)]
Marking tst_qquickgridview as insignificant in win and macx
This test is flaky.
Task-number: QTBUG-33017
Change-Id: I589706937a6de44291694029afb11c05a285c1cd
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Simo Fält [Fri, 16 Aug 2013 09:44:37 +0000 (12:44 +0300)]
Marking tst_qquicktextedit as insignificant in win
This test haven't passed in WIN after the stage was made blocking.
Change-Id: I246f96e98080845c5364aba720158dbd42a5f454
Task-number: QTBUG-32540
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Mitch Curtis [Thu, 15 Aug 2013 13:04:01 +0000 (15:04 +0200)]
Don't repaint the Canvas if it's just changing position.
Task-number: QTBUG-33005
Change-Id: I94613c0a0e066798800e068aee7c6288fce54dbd
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Sergio Ahumada [Thu, 15 Aug 2013 18:56:56 +0000 (20:56 +0200)]
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I3953f2473e3b2cf9768286fef1c5efd08c61c6f0
Alan Alpert [Tue, 13 Aug 2013 23:07:25 +0000 (16:07 -0700)]
Add changes-5.1.1 file
Task-number: QTBUG-32808
Change-Id: I44852be41c18491a38f80afa71eda8b85b51381d
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Simo Fält [Thu, 15 Aug 2013 10:42:15 +0000 (13:42 +0300)]
Marking tst_qquickitem as insignificant in win
This test haven't passed in WIN after the stage was made blocking.
Task-number: QTBUG-32664
Change-Id: I0e84ff202d28a018e3e04dcf15f3a9ce6c66349b
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Simo Fält [Thu, 15 Aug 2013 12:48:28 +0000 (15:48 +0300)]
Marking tst_qquickmousearea as insignificant on win
This test seems flaky in windows.
Task-number: QTBUG-33006
Change-Id: I1c67e1a498e4c5765580a316504e04776af5e109
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Gunnar Sletta [Thu, 15 Aug 2013 11:52:16 +0000 (13:52 +0200)]
Make sure we propegate the filtering state to the internal texture.
Change-Id: Id928cf35eba254270b29a34129eb977dab34db63
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Daiwei Li [Fri, 9 Aug 2013 19:04:41 +0000 (12:04 -0700)]
Unset the cursor when an Item is unparented
It's possible for a cursor to get stuck if an item
gets deleted. QQuickItemPrivate::derefWindow sets
the cursorItem in QQuickWindowPrivate to 0, but
doesn't unset the cursor. This causes the cursor
to get stuck until the user hovers their mouse over
an item that has a cursor set.
Change-Id: I1d5d3ff13d69c76e4f8fe86b1f5b669bb714ecca
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Sergio Ahumada [Tue, 13 Aug 2013 22:18:19 +0000 (00:18 +0200)]
Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable
Sergio Ahumada [Mon, 12 Aug 2013 08:30:58 +0000 (10:30 +0200)]
test: Mark tst_qqmlmoduleplugin::incorrectPluginCase() as XFAIL
Mark incorrectPluginCase() as expected failure on OS X 10.8
Task-number: QTBUG-32652
Change-Id: I8fd2c0ceacabfc74defe84fc6538b268145c5110
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Josh Faust [Thu, 1 Aug 2013 22:51:03 +0000 (16:51 -0600)]
Fix hover event crash
It was possible for a hover event to be sent to a QQuickItem that has
already been scheduled to be deleted (through deleteLater()). This
lead to an access on an already-freed object when the leave event
is generated. This change ensures that the item is part of a scene
before generating the hover enter event.
Task-number: QTBUG-32771
Change-Id: I69adb6bbd0ae52c70a6bda4e6c918b7671549a4c
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Sergio Ahumada [Fri, 9 Aug 2013 20:37:42 +0000 (22:37 +0200)]
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I3bcc89d3e503b933e4bd4df241c8169e73fb9bd5
Sergio Ahumada [Fri, 9 Aug 2013 11:16:28 +0000 (13:16 +0200)]
test: Adapt to Qt.platform.os rename ("mac" -> "osx")
Marking this test as QSKIP and also updating the JIRA task
Task-number: QTBUG-32650
Change-Id: I9e98024bf50c43f96269c39d779803ae9c46168d
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Topi Reinio [Thu, 1 Aug 2013 09:39:02 +0000 (11:39 +0200)]
Doc: Update example used for QML getting started tutorial
Update the example project referred to in Getting Started with Qt
Quick tutorial.
- Fix coding/comment style issues
- Change plugin TARGET name, Use /imports as the
destination directory
- Fix qmldir with proper module info, delete unused
qmldir from /core
- Add a .qmlproject file
Change-Id: If269e61fb76399faae753469dc251d07cc219139
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Kai Koehne [Wed, 7 Aug 2013 09:07:40 +0000 (11:07 +0200)]
Fix needless conversion from char * to QString
Converting the strings to UTF-16 unconditionally whenever the library is
loaded is overkill. Anyhow, the literals are only passed to methods also
accepting a QLatin1String, so we don't have to convert at all.
Change-Id: I84e813ac989344bc2e359f340696423766392c93
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Kai Koehne [Wed, 7 Aug 2013 08:43:10 +0000 (10:43 +0200)]
Remove unused local variables
Change-Id: I910c47cd404c0c5c1c324e956927966e834b488e
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Gunnar Sletta [Wed, 7 Aug 2013 08:07:34 +0000 (10:07 +0200)]
Stop the update timer when no windows are visible
Change-Id: Ib9758a99891829d9bec81996687373d08ecfa055
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Thiago Macieira [Tue, 6 Aug 2013 05:12:40 +0000 (22:12 -0700)]
Remove C-style casts from public headers.
Task-number: QTBUG-32735
Change-Id: I14c313d17b80dce1826290ddd634f449b315190e
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Nico Vertriest [Thu, 4 Jul 2013 12:13:44 +0000 (14:13 +0200)]
Doc: createObject: adapted description of example
Plus language/style edits
Restored brief statement QQmlComponent.cpp
Task-number: QTBUG-32222
Change-Id: I07da54bad3e13f163475ed2a0760e66d50795f6f
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Michael Brasser [Thu, 1 Aug 2013 17:38:36 +0000 (12:38 -0500)]
Improve memory usage of QQuickTextNode.
The typical number of BinaryTreeNodes needed for a text line should be
much lower than 256.
Task-number: QTBUG-32770
Change-Id: I85aa161eb7cb6e55657213304b7577a0a33f1b67
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Duncan Cunningham [Wed, 31 Jul 2013 22:12:24 +0000 (17:12 -0500)]
Fix crash in QQmlDebugService::objectForLocationInfo()
Fixed crash in QQmlDebugService::objectForLocationInfo() where it
was using QObject pointers in the object reference id hash
table that had been deleted. Now objectForLocationInfo() checks if
the QObject has been deleted and removes it from the object
reference hash before trying to look up the filename, line number,
and column number.
Change-Id: Iba7be7c490e97a2e7685685b0c6e501cfe1e833e
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
Rafael Roquetto [Tue, 30 Jul 2013 20:07:48 +0000 (17:07 -0300)]
Fix tst_qquickpath not to use fuzzy compare
On arm platforms, qreal == float. QPointF stores its coordinates internally on
qreal variables (float on arm). When QPointF comparison takes place, a call to
qFuzzyIsNull(float) will ultimately be triggered, causing the test to fail for
some values, because the epsilon of 0.00001f is too small.
In the particular case regarding BB10, the comparison between QPointF(100,
150) and QPointF(99.9999771, 150) is failing because of that.
Change-Id: I53c8cfe7f8a975f6a015e7690702d3e5f05bc2f2
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Rafael Roquetto [Mon, 22 Jul 2013 20:40:22 +0000 (17:40 -0300)]
Fix tst_qquicktextedit
- Use showNormal() instead of show() to keep expected window sizes on
fullscreen platforms.
- Use consistent point size for hAlignVisual
- Do not query for QQmlComponent::Loading on remoteCursorDelegate: when a new
connection is established to the test http server, it will setup a single
shot QTimer with a 500ms timeout that will trigger the reply to be sent
back, making the call to sendDelayedItem() obsolete and reduntant. Also, it
means that in some platforms, data will arrive back to the component before
the check for QQmlComponent::Loading is executed, causing the test to fail
since at this point the status will already be QQmlComponent::Ready instead.
Change-Id: I6508c28fa55a1aa2ae5861922701a8c322342380
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Topi Reinio [Wed, 31 Jul 2013 12:53:20 +0000 (14:53 +0200)]
Doc: Remove unused /parts directory from QML getting started example
The example code for getting started with QML doc has six smaller
projects under /parts - these out of sync with the main example
code in its parent directory, they are undocumented and not referred
to in any other documentation. The QML getting started guide itself
uses \code blocks to present the code snippets.
Change-Id: I3b9c83a60fdeb9fa13f364b04c38943222c682cb
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Michael Brasser [Thu, 1 Aug 2013 13:44:27 +0000 (08:44 -0500)]
Avoid using connect in QQuickImplicitSizeItem.
In the past connect has shown up as a noticeable cost in item
creation. Avoid the use here by refactoring to call base class
implementation and emit override signal as well.
Task-number: QTBUG-32764
Change-Id: If3e5a1cc55c113d812705fcfdc7a17aee9d6f51c
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
Michael Brasser [Fri, 19 Jul 2013 19:32:17 +0000 (14:32 -0500)]
Fix crash when changing non-cached source of image during animation
Ensure deferred deletions are handled while syncing, otherwise texture
might be deleted after sync but before deferred deletion is processed.
Task-number: QTBUG-32513
Change-Id: Id276f536a5722a36baae815b7b550b574eeeb483
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Gunnar Sletta [Thu, 1 Aug 2013 06:34:20 +0000 (08:34 +0200)]
Remove comment that QQuickPaintedItem is only useful for porting.
Change-Id: I5d4a7917baa7c8f8dd7cfe3f49c6cf4fe5532ac0
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Yoann Lopes [Thu, 1 Aug 2013 13:55:45 +0000 (15:55 +0200)]
Fixed distance field text getting clipped at small sizes.
Task-number: QTBUG-32750
Change-Id: I6bdf63d3cbcaaeb54c7c1ae25dfc55fc7e964075
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Topi Reinio [Tue, 16 Jul 2013 13:01:57 +0000 (15:01 +0200)]
Doc: Clean up docs for PathView.highlightRangeMode enum values
Fix PathView.NoHighlightRange description, move the enum values
into a list, and do some minor editing.
Task-number: QTBUG-16160
Change-Id: I5356c21ea3244ce43defa346da11696a8706c71f
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Gunnar Sletta [Tue, 30 Jul 2013 20:16:19 +0000 (22:16 +0200)]
Rectangle which only draw an opaque border should not be blended.
Change-Id: I55996a1c38ad6da4566d2160155503a27ad4a20b
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Friedemann Kleint [Fri, 26 Jul 2013 14:56:49 +0000 (16:56 +0200)]
Stabilize tst_qquickitem.
Instantiate windows and views on the stack or add
QScopedPointer. Add waitForWindowExposed() after show().
Add diagnostic message.
Task-number: QTBUG-32664
Change-Id: I190f2a0490b8333a7886a23e26582c6cb615df94
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Friedemann Kleint [Mon, 29 Jul 2013 12:46:37 +0000 (14:46 +0200)]
Add diagnostic output to tst_qquickpathview::cancelDrag().
Task-number: QTBUG-32662
Change-Id: I62b53f94659be95b3bef86f853733998d4d882dc
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Nils Jeisecke [Tue, 30 Jul 2013 11:59:01 +0000 (13:59 +0200)]
Correctly update flickable visibleArea.heightRatio when geometry changes
Without this fix the visibleArea.heightRatio and widthRatio values
were only updated on geometry changes when flicking was active.
So when setting the flickable geometry to the content geometry and
thereby disabling flicking the ratios were not updated.
This could for example cause wrong scrollbar renderings.
The ratios are now also calculated directly after accessing the
visibleArea property for the first time.
The new autotest covers both problems.
Change-Id: I54ba606524557fb328a198c312c1f65eb125c5a3
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Shawn Rutledge [Tue, 30 Jul 2013 13:02:36 +0000 (15:02 +0200)]
QtQuick.Dialogs.ColorDialog: set current color in the QColorDialog
It was a missing feature to set the current color programmatically,
either before or after showing the dialog.
Task-number: QTBUG-32621
Change-Id: I62a811f7c36eaab5356c5924bf3447deca55ada3
Reviewed-by: Liang Qi <liang.qi@digia.com>
J-P Nurmi [Mon, 29 Jul 2013 19:50:41 +0000 (21:50 +0200)]
QQuickListViewPrivate::updateStickySections(): add missing null check
Task-number: QTBUG-32711
Change-Id: I45ed6829f2c240e8352dac33beeee803cb88a18d
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Rafael Roquetto [Fri, 26 Jul 2013 20:58:00 +0000 (17:58 -0300)]
Fix tst_QQuickDrag::recursion()
Process events and handle number of move events correctly.
Change-Id: I555582ad4e10d5c76bbdc8ce9203b8f5897d0f56
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Friedemann Kleint [Fri, 26 Jul 2013 12:40:09 +0000 (14:40 +0200)]
FolderListModel: Do not return invalid URLs like "file:" when navigating up.
Task-number: QTBUG-32139
Change-Id: I715b97eb85bc4235de6a2bb696131efae56477fd
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Friedemann Kleint [Fri, 26 Jul 2013 12:26:23 +0000 (14:26 +0200)]
FolderListModel: Fix setting of directory in componentComplete().
Discovered when fixing
Task-number: QTBUG-32139
Change-Id: I94d1a958069666ed43db146a7393e5f1ff4e177e
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Shawn Rutledge [Tue, 23 Jul 2013 09:19:33 +0000 (11:19 +0200)]
Make buttons and tabs larger in QML examples and dialogs
Task-number: QTBUG-32578
Change-Id: Ic89058abc55e5e079f44862986b2132114456147
Reviewed-by: Liang Qi <liang.qi@digia.com>
Sergio Ahumada [Fri, 26 Jul 2013 19:50:00 +0000 (21:50 +0200)]
Merge remote-tracking branch 'origin/release' into stable
Change-Id: Ibb0e597c0cd02732bae3ef0ccc31c3ef36c75584
Sergio Ahumada [Fri, 26 Jul 2013 12:30:55 +0000 (14:30 +0200)]
test: Remove insignificant mark from tst_touchmouse
Tests are passing nowaways on OS X.
Task-number: QTBUG-27890
Change-Id: I2245801a44b9b6fd8773c91e2d5dd67f5a5b7373
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Sergio Ahumada [Fri, 26 Jul 2013 12:28:45 +0000 (14:28 +0200)]
test: Remove insignificant mark from tst_qquickgridview
Tests are passing nowaways on OS X.
Task-number: QTBUG-27890
Change-Id: Iddceb2f0641115f03e5116c38e95ae5772938248
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Yoann Lopes [Tue, 23 Jul 2013 14:19:57 +0000 (16:19 +0200)]
Workaround for distance field glyph upload problem.
It seems uploading an image (into a texture) which has
padding at the end of each scanLine and alpha-only pixel format
is broken with some OpenGL ES drivers.
The workaround is to upload one line at a time.
Task-number: QTBUG-30908
Change-Id: Ic680654951b6aec294c1a173708c1fb75e57ff8f
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Topi Reinio [Fri, 21 Jun 2013 08:50:48 +0000 (10:50 +0200)]
Doc: Update Tweet Search Demo to use Twitter Search API v1.1
Twitter REST API v1 is no longer supported. This change updates the
Tweet Search Demo to use the new version (v1.1). Specifically,
- Use of OAuth tokens (authentication required in v1.1)
- JSON parsing for results instead of XML
- Use of url/hashtag/username entities returned in search results
Also, update the documentation to discuss authentication and
registering the application to dev.twitter.com.
Task-number: QTBUG-31745
Change-Id: I00cd7b07f065babb03483daabe8df22f22995c29
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Rafael Roquetto [Tue, 23 Jul 2013 19:04:41 +0000 (16:04 -0300)]
Fix tst_qquicktextinput::remoteCursorDelegate
Do not query for QQmlComponent::Loading on remoteCursorDelegate: when a new
connection is established to the test http server, it will setup a single
shot QTimer with a 500ms timeout that will trigger the reply to be sent
back, making the call to sendDelayedItem() obsolete and reduntant. Also, it
means that in some platforms, data will arrive back to the component before
the check for QQmlComponent::Loading is executed, causing the test to fail
since at this point the status will already be QQmlComponent::Ready instead.
Change-Id: I30adeed2a669d5f6618f56d8a023fe7eaea16bc0
Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Friedemann Kleint [Mon, 22 Jul 2013 13:52:54 +0000 (15:52 +0200)]
Stabilize text tests that grab windows.
Add window flags to make sure window stays on top to
tst_qquicktext::hAlignImplicitWidth() and
tst_qquicktextedit::hAlignVisual(). Add diagnostic output.
Determine the section size by checking the font size.
Add more characters to line 2 to make it more discriminative.
Task-number: QTBUG-32540
Change-Id: I19a74a775bf2663027ec211784870fd9f6547b48
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Rafael Roquetto [Wed, 24 Jul 2013 22:17:11 +0000 (19:17 -0300)]
Fix tst_qquickwindow for fullscreen platforms
Change-Id: I040282f1bf1a2a8f212b9c7192a5ffaa2dbfdfb8
Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Rafael Roquetto [Tue, 23 Jul 2013 19:24:35 +0000 (16:24 -0300)]
Fix tst_rendernode for fullscreen platforms
Change-Id: Ib82aef04b7748ecdf148c3d9ec60ad15b3dfd7cb
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Rafael Roquetto [Tue, 23 Jul 2013 18:59:16 +0000 (15:59 -0300)]
Fix tst_qquicktextinput for fullscreen platforms
Change-Id: I42683f69a439608f778fbccf90573173bbc03f5b
Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Shawn Rutledge [Tue, 23 Jul 2013 08:49:10 +0000 (10:49 +0200)]
Keep the QML ColorDialog's controls in sync with the color property
Until now, the user could change the color by dragging the crosshairs
or the sliders, but if the application set the color property, it did
not programmatically move the crosshairs and sliders.
Task-number: QTBUG-32545
Change-Id: Idd54e711400dfd78d570161297559f9521c1d67f
Reviewed-by: Liang Qi <liang.qi@digia.com>
Shawn Rutledge [Tue, 23 Jul 2013 07:47:35 +0000 (09:47 +0200)]
Correct initial/minimum size of default QML ColorDialog
Change-Id: Idd53d9c7246b17a9159faec06a7ce6c6355cd09f
Task-number: QTBUG-32572
Reviewed-by: Liang Qi <liang.qi@digia.com>
Andy Shaw [Fri, 19 Jul 2013 06:42:58 +0000 (08:42 +0200)]
Always use QDir::exists() for checking if something exists
If there is a custom file engine in use by the application then it will
not be able to tell if the file exists if the system stat() call is
used. Therefore we let it use QDir::exists() on all platforms to ensure
that this is taken care of.
Change-Id: I0c93cfdad1e71b40512bcf1766de6a705a76bd9c
Reviewed-by: Marcus Tillmanns <maddimax@gmail.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Topi Reinio [Tue, 23 Jul 2013 11:59:43 +0000 (13:59 +0200)]
Doc: Link to QML Qt object in relevant locations
There is no obvious path to find the reference for QML Qt object.
This change adds links to it in Qt QML module index page and QML
Basic Types documentation.
Task-number: QTBUG-31921
Change-Id: I8a4ef1b3e696a0a7dec416d759ae64110e59c6c0
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Jerome Pasion [Tue, 23 Jul 2013 12:34:35 +0000 (14:34 +0200)]
Doc: Modified the term for the Qt global object.
QtQml::Qt is a "QML global object" to differentiate it from the
Qt namespace.
"QML Qt object"
"QML Qt global object"
"Qt global object" (in the context of QML-only pages)
Change-Id: I1d2896ad48e8432c5eb8b18f05af247986bff336
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Albert Astals Cid [Tue, 28 May 2013 08:28:56 +0000 (10:28 +0200)]
Resizing items out of the list viewport should not change the viewport
Consider the old geometry, not the new one to check if an item
was outside the viewport or not
Change-Id: I108412d560faf86130044f3d091254c07af0c004
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Sergio Ahumada [Tue, 23 Jul 2013 09:54:34 +0000 (11:54 +0200)]
Bump MODULE_VERSION to 5.1.2
Change-Id: I8090b927f43ed154400ce56e1118dbe8a092bfb7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Mitch Curtis [Fri, 19 Jul 2013 09:15:20 +0000 (11:15 +0200)]
Link between "QML Basic Type: date" and QML Date object documentation.
The basic date type seems useless if you don't know it can be used as
as JavaScript date (with QML extensions).
Task-number: QTBUG-32492
Change-Id: I14962f4e57522f5515f0e78d484aa59fcd9dff3c
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Shawn Rutledge [Mon, 22 Jul 2013 14:49:26 +0000 (16:49 +0200)]
Put back OTHER_FILES in systemdialogs example
Partial revert of
1e9589eb0c2bb9404e11c69e1d76ef9efd89af56.
Creator currently needs this variable in order to find the QML files.
(see https://bugreports.qt-project.org/browse/QTCREATORBUG-9860)
Change-Id: Id5882dfe9733a6b401976e4d6e5baf2066d21b1b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Fri, 19 Jul 2013 16:39:07 +0000 (18:39 +0200)]
remove pointless assignments
the magic in qt_example_installs.prf handles this automatically.
Change-Id: I19f0560a6e3d2ddbe8a0128b463aecb7ff45475e
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Oswald Buddenhagen [Fri, 19 Jul 2013 16:37:31 +0000 (18:37 +0200)]
unbreak installation after project move
Change-Id: I47e9e7009978b494e6b2b06f793bf1948d443b72
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Robin Burchell [Thu, 18 Jul 2013 11:09:27 +0000 (13:09 +0200)]
Remove unnecessary CONFIG += ordered.
None of the subdirectories here apepar to depend on each other.
Change-Id: Id8ac9f030ecc0b440ee5193bad9bb710cec11edd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Friedemann Kleint [Thu, 18 Jul 2013 08:29:17 +0000 (10:29 +0200)]
Use GET method for redirect in QDeclarativeXMLHttpRequest.
Initial-patch-by: Marek Więckowski <wiecko@fuw.edu.pl>
Task-number: QTBUG-32332
Change-Id: I5514d97ef8574f8e7eef8fcca39bed4cd7e917ad
Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
Simo Fält [Mon, 22 Jul 2013 05:26:40 +0000 (08:26 +0300)]
Mark tst_dialogs insignificant in win also
Task-number: QTBUG-30513
Change-Id: Ib7b2f7f710be223aeb572061757cd8acd6d6852e
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Sergio Ahumada [Fri, 5 Jul 2013 18:46:19 +0000 (11:46 -0700)]
test: Add 5.0.0/5.1.0 bic data for linux-gcc-ia32
QtQuick and QtQuickTest data was missing from before,
so taking the opportunity to add it now.
Change-Id: I120ecd440c0c25e338aa2badafec6e1eddae5425
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Rafael Roquetto [Wed, 17 Jul 2013 20:44:31 +0000 (17:44 -0300)]
Fix tst_qquickview for full screen platforms
Some test cases rely on the fact that show() is not fullscreen, which may not
be true for some platforms. Explicitly make use of showNormal() to avoid
full-screen show on these platforms.
Change-Id: I0787fb62b8e37a73974f87857de200485d7ba6da
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Shawn Rutledge [Wed, 17 Jul 2013 11:24:16 +0000 (13:24 +0200)]
systemdialogs example: ensure that all QML files work with qmlscene
Sync up relative paths in the qrc and the actual directories so that
you can run qmlscene with any of the QML files in this directory
and it will still find the shared resources.
Change-Id: I0f216df6b370c19948312fa00a33ce77ccabcd78
Reviewed-by: Liang Qi <liang.qi@digia.com>
Simon Hausmann [Tue, 16 Jul 2013 13:35:10 +0000 (15:35 +0200)]
Forward port auto test for fix in QtQuick1
This is the auto-test part of https://codereview.qt-project.org/#change,61117
The test passes as-is but we should forward the fix to ensure that we
don't regress.
Change-Id: Ief8fcfc29d671f33cd1b2c3bab7acfd4fcd1df2b
Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
Friedemann Kleint [Mon, 15 Jul 2013 12:59:07 +0000 (14:59 +0200)]
Fix organization domains.
Task-number: QTBUG-32390
Change-Id: Ibc7e0e85adfffdb7abbd61e8948064e36a8fce9b
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Friedemann Kleint [Mon, 15 Jul 2013 12:58:14 +0000 (14:58 +0200)]
Replace qt.nokia.com by qt-project.org in tests.
Task-number: QTBUG-32390
Change-Id: If318cf9bbcaa36e6e60d693dd0cb9a58768af47b
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Friedemann Kleint [Fri, 12 Jul 2013 08:11:56 +0000 (10:11 +0200)]
Replace nokia.com by www.qt-project.org in tests.
Task-number: QTBUG-32390
Change-Id: I595b1bf683d1e63e44354c042f23dd9e10847862
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Friedemann Kleint [Thu, 11 Jul 2013 07:59:03 +0000 (09:59 +0200)]
Fix CLANG-warning '&&' within '||' [-Wlogical-op-parentheses].
Change-Id: Id724c86f87a78048df9b93f2d190593d36261943
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Friedemann Kleint [Thu, 11 Jul 2013 07:57:58 +0000 (09:57 +0200)]
Fix CLANG-warning about unused member variable m_defaultAntialiasingMode.
Change-Id: I68a04532bacd326b4bb3eb8f9a7ee04c67fcd68e
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Shawn Rutledge [Thu, 11 Jul 2013 08:58:16 +0000 (10:58 +0200)]
Window example: delay showing the splash until Component.onCompleted
Otherwise it will have the wrong size on KDE.
Task-number: QTBUG-32223
Change-Id: I3ed92ff8aead5c6e5a37a5189c7103a5383087ae
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Stephen Kelly [Tue, 2 Jul 2013 22:13:38 +0000 (00:13 +0200)]
Add a unit test for testing Qt in its install location.
Change-Id: Ide70affa28f0ec37535b5a4ce1bcafac8ac58351
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
J-P Nurmi [Mon, 8 Jul 2013 13:55:37 +0000 (15:55 +0200)]
Docs: restore missing ListModel methods
Change-Id: Icb491d14d42af769928b1663be0877e23ff43850
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Thorbjørn Lindeijer [Sat, 11 May 2013 19:54:00 +0000 (21:54 +0200)]
Fixed typo 'backens'
Change-Id: I65e4492d1bc70e5344c0edc37a7c2f87fe355e62
Reviewed-by: Thorbjørn Lindeijer <bjorn@lindeijer.nl>
Albert Astals Cid [Fri, 5 Jul 2013 08:49:55 +0000 (10:49 +0200)]
Update snap when snapMode changes
Task-number: QTBUG-32258
Change-Id: Id2120acad06d7cfce988400df0067e2c0f16eb24
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Mitch Curtis [Mon, 8 Jul 2013 10:29:18 +0000 (12:29 +0200)]
Fix typo in Graphical Effects documentation.
Change-Id: Iad5ee6a965a6373941468bf98ac328e51c5c4066
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
J-P Nurmi [Thu, 4 Jul 2013 10:21:04 +0000 (12:21 +0200)]
qmlscene: ensure that the window & component get destructed
Task-number: QTBUG-32207
Change-Id: Ic7c45228cbdc049d3dfdb3482296d0e8c89a930c
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Friedemann Kleint [Thu, 4 Jul 2013 09:45:54 +0000 (11:45 +0200)]
Remove objectlistmodel.qmlproject file.
The example has C++ source code and cannot be run
as qmlproject.
Change-Id: I2d71d3ffc600ca71898ad402499f7a070455c266
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
J-P Nurmi [Sat, 22 Jun 2013 13:49:26 +0000 (15:49 +0200)]
Item views: do not track the geometry of items being removed
Task-number: QTBUG-31873
Change-Id: I4230893ccb2925ed9c2429d26b411264bf7c1c65
Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
Pierre Rossi [Mon, 1 Jul 2013 16:33:19 +0000 (18:33 +0200)]
QQuickTextEdit: move QSG* members from dptr to root node.
Subclass QSGTransform node for our use case and add the frame decorations
and cursor nodes in there.
Task-number: QTBUG-31580
Change-Id: Id2b468b53092f21134ae45e5694bc54c43660f8b
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>