Sérgio Martins [Fri, 7 Sep 2012 11:00:30 +0000 (12:00 +0100)]
Fix performance bottleneck in QQuickWindow::mouseMoveEvent().
When a mouse move event is received, a lot of time is spent looking
for items with cursors, recursively.
With this patch, it will only recur into item hierarchies that
contain cursors.
Not having cursors is much more common than having them.
Benchmark included:
Before: 15 msecs per iteration (total: 62, iterations: 4)
After: 0.000064 msecs per iteration (total: 68, iterations: 1048576)
Task-number: QTBUG-27054
Change-Id: I3a5441652ca1c0b8d2cbc5683013562174f5af4a
Reviewed-by: Alan Alpert <416365416c@gmail.com>
Miikka Heikkinen [Tue, 9 Oct 2012 11:40:17 +0000 (14:40 +0300)]
Add missing contents dir to installation of canvas example
Task-number: QTBUG-26995
Change-Id: Ib346c857f9e0bc97bb2e4365abddb6475c7142d4
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Peter Varga [Tue, 25 Sep 2012 15:15:22 +0000 (17:15 +0200)]
Remove calculateHash function
This function has been moved into QtV8 module.
Change-Id: Ibc5b0a52bd158e8880a10300eb6b89b7f43db0f6
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Thomas McGuire [Fri, 28 Sep 2012 09:28:23 +0000 (11:28 +0200)]
Fix QObject::receivers() within connectNotify()
The receiver count needs to be correct in connectNotify() to be
compatible with ordinary connections.
Fix this and add test.
Change-Id: Icff0486dac49876b8c5d8836a85cff9284368a52
Reviewed-by: Alan Alpert <416365416c@gmail.com>
Thomas McGuire [Thu, 27 Sep 2012 11:30:44 +0000 (13:30 +0200)]
In tst_qqmlnotifier, verify the result of QObject::receivers()
Change-Id: If7f93e51afc46c153a87d00a9d9913e0058a09e8
Reviewed-by: Alan Alpert <416365416c@gmail.com>
Peter Varga [Mon, 1 Oct 2012 16:18:59 +0000 (18:18 +0200)]
Update regex related tests of QJSEngine
Modify expected results based on ECMA-262 standard and current results
of JSC.
Task-number: QTBUG-27169
Change-Id: I705d474b2a62775860f6ff6eba8a0f6b28f50ff3
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Thomas Hartmann [Mon, 8 Oct 2012 08:34:09 +0000 (10:34 +0200)]
crash fix in designersupport
Unless result is an insert iterator, qCopy()
assumes that all iterators in the range
[result + (finish - start)] are dereferenceable.
This is not the case for an empty list.
Using foreach instead.
Change-Id: I2212a88e9b462ae2220ba5aeb43c662592cec57f
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Thomas Hartmann [Mon, 1 Oct 2012 10:23:50 +0000 (12:23 +0200)]
Complete QmlJSVisitor for UiParameterList
QmlJS::Visitor was missing the visit for UiParameterList.
Change-Id: I3c2cb76b934059ebcef53c1a0faad3f239b33359
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Christian Kamm <kamm@incasoftware.de>
Oliver Wolff [Thu, 4 Oct 2012 08:26:52 +0000 (10:26 +0200)]
Be more verbose about error when using shared.h for examples
Instead of just aborting the program it should at least give a hint
about what actually went wrong.
Change-Id: I4019b3c026ba1777905f457562bdc77e5c05df4f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Jerome Pasion [Wed, 3 Oct 2012 13:48:26 +0000 (15:48 +0200)]
Doc: Cleaned up Qt Quick module's titles and added them to group
-'qmlmodules' group contains the QML APIs in Qt
Change-Id: I797e6ee0c9e643a92b9e16d476c93b34e79d67d8
Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
Oliver Wolff [Tue, 2 Oct 2012 09:45:13 +0000 (11:45 +0200)]
Use correct path to qml files when looking for them in examples
As executables might end up in different folders on different plaforms
when built, examples' shared.h should not rely on having the qml files
in the same folder as the executables. On Windows they end up in debug/
release by default, while they are put in foo.app/Contents/MacOs on Mac
if app_bundle is set in CONFIG.
Change-Id: If0cea4c186920eb4689d5941b6ff5f333d97c574
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Gabriel de Dietrich [Thu, 16 Feb 2012 09:18:56 +0000 (10:18 +0100)]
Fix emitting originYChanged signals even when originY wouldn't change
Same for originXChanged.
Conflicts:
src/quick/items/qquickflickable.cpp
src/quick/items/qquickflickable_p_p.h
Change-Id: I1a316f326b924da4722b692cf27db48312fc9236
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Thomas Hartmann [Fri, 28 Sep 2012 15:35:21 +0000 (17:35 +0200)]
Fix in QmlJS parser for UiParameterList
The propertyTypeToken was not initilized in this case.
Not having the source location of this token leads to
bugs in the tooling. e. g.: QTCREATORBUG-7931
I also added the initializer for program keeping the parser
and the grammar in sync.
Change-Id: Id7bfb4b6dd1b9689e701a858b6c769d3addab5dc
Reviewed-by: Christian Kamm <kamm@incasoftware.de>
Balazs Kelemen [Thu, 27 Sep 2012 10:24:25 +0000 (12:24 +0200)]
Allow grabbing windows rendered without showing for testing.
To make QQuickWindowPrivate::setRenderWithoutShowing more useful
for autotesting we can allow grabbing such windows. This is safe
if the platform window have been created and the window has a valid
size.
Change-Id: I8b9a2aaeb93935f662b75ef29651730b890441d5
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Eskil Abrahamsen Blomfeldt [Mon, 6 Aug 2012 09:51:09 +0000 (11:51 +0200)]
Fix potential crash when using text and more than 1 QQuickView
We need to use a resource guard for the FBO in case there is no
current context when the glyph cache is deleted.
This reverts commit
b3264e2cb6a8fe87754aa1335ab9f8d5e3910c14 which
was implemented as a band-aid for this crash.
Change-Id: I5b3a09a3998da38836ea851cd0978d3ddadcd2cc
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Jocelyn Turcotte [Thu, 27 Sep 2012 14:56:03 +0000 (16:56 +0200)]
Fix a crash in QQmlPropertyCache::findProperty
When the top type of a QML component is a C++ type registered with
qmlRegisterExtendedType, its QObjectPrivate::metaObject is already a
QQmlProxyMetaObject that gets chained as the parent of the
QQmlVMEMetaObject of the component.
When QQmlPropertyCache::findProperty iterates over the parents chain
of a child item, our QQmlProxyMetaObject eventually gets static_casted
to QQmlVMEMetaObject and causes a crash.
This patch implements a poor man's dynamic_cast in
QQmlVMEMetaObject::parentVMEMetaObject to fix the crash. Other casts
of parent.asT1() are changed to use parentVMEMetaObject as well even
though in those cases the static_cast is guaranteed by the context.
Task-number: QTBUG-27334
Change-Id: I5982fc273ccf466960ce54974cff5662e6ab605a
Reviewed-by: Matthew Vogt <mattvogt2@gmail.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Kai Koehne [Fri, 28 Sep 2012 07:17:06 +0000 (09:17 +0200)]
Examples: Fix calcqlatr.qmlproject
Change-Id: I6a88f4f5c774962ad6c022954e0070d2a2eaadbd
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
aavit [Fri, 7 Sep 2012 11:29:53 +0000 (13:29 +0200)]
Added lancelot-based scenegraph rendering regression test
Change-Id: I6718d00ba96dc9c96dac82de4ded9228f6bfb990
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Jędrzej Nowacki [Fri, 21 Sep 2012 13:28:01 +0000 (15:28 +0200)]
Update qMetaType helpers usage.
QtDeclarative is using private meta type api to register custom types,
but the helper functions were updated to a new signature.
Change-Id: I467b283b5b1ccdad8ebd1a2bb651e8ad59b9c55d
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Jerome Pasion [Tue, 25 Sep 2012 10:07:34 +0000 (12:07 +0200)]
HTML template: Updated copyright notice from Nokia to Digia Plc
Change-Id: I0656a4331e3a6f6a6a527500565c73f50b61f8d1
Reviewed-by: Martin Smith <martin.smith@digia.com>
Venugopal Shivashankar [Wed, 26 Sep 2012 10:07:19 +0000 (12:07 +0200)]
Doc: Removed the verbs from the page and section titles
Change-Id: I9f8b98e40340a5f871f7a66a3d7ea63675e21d34
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Sean Harmer [Mon, 24 Sep 2012 12:08:16 +0000 (13:08 +0100)]
Work around mis-optimisation on QNX/SGX in AA vertex shader
The new AA algorithm which is implemented in the vertex shader of
SmoothColorMaterialShader and SmoothTextureMaterialShader exposes
a driver bug in the glsl compiler/optimiser for the GPU used in
the BlackBerry PlayBook.
The bug results in the if (scale < 0.0) scale = 1.0 code always
being executed even when the condition is false. This leads to
massive corrupion of Image, Rectangle, and BorderImage elements
when the antialiasing property is enabled.
This commit works around the compiler bug by refactoring the
vertex shader to explicitly include an else clause. The check for
negative values is now performed on the numerator only as the
denominator is dot(dir, dir) which is always positive (square of
magnitude of dir vector).
This gives the correct behaviour on all platforms (that I have
access to).
Change-Id: I236542c9b59ff2915e95cbd9300b442be316bba9
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Eskil Abrahamsen Blomfeldt [Tue, 25 Sep 2012 13:11:13 +0000 (15:11 +0200)]
doc: Fix some typos in C++ integration documentation
Change-Id: I883109cf2528a5e10487b38f453c2eed96cc3204
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Konstantin Ritt [Tue, 25 Sep 2012 23:01:47 +0000 (02:01 +0300)]
Mark some tests as insignificant to let change#35527 be integrated
Change-Id: Ic4f7200e04d1decf3eb1be551606a73eeb90c5e5
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Samuel Rødal [Sun, 23 Sep 2012 21:22:05 +0000 (23:22 +0200)]
Android also needs <ctype.h> for isspace() to be found.
Change-Id: Ic1299cd8949c37c6909b8d2ab36e930097335a4d
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Samuel Rødal [Mon, 24 Sep 2012 14:25:44 +0000 (16:25 +0200)]
Fixed instances of "to to" in qtdeclarative.
Really it should just be "to".
Change-Id: I3263c8d6ce2f0ad33ab12d7ddb9202beac578f91
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Samuel Rødal [Sun, 23 Sep 2012 17:21:03 +0000 (19:21 +0200)]
Fixed missing virtual destructors in qtdeclarative.
Change-Id: I0b0e63b572617a56874e27361479de2690644aa3
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Andreas Holzammer [Fri, 21 Sep 2012 07:32:07 +0000 (09:32 +0200)]
Windows CE buildfix
Windows CE has a define for CONST,
so undef it.
Change-Id: I13d363657e91956c611dee4cf90cd17f6a0fa234
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Sergio Ahumada [Sun, 23 Sep 2012 16:39:22 +0000 (18:39 +0200)]
test: Change declarative -> qml in global.cfg
This change will be needed to run tst_bic
Change-Id: Id924b501bfd26121168c8e0e14dc49cbb883ccb2
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
J-P Nurmi [Sat, 15 Sep 2012 17:24:07 +0000 (19:24 +0200)]
tst_QQuickListView::sectionsDelegate_headerVisibility(): restore QSKIP
Task-number: QTBUG-24395
Change-Id: Idd403aa5e81965f4ebf14378b28b47c099a2c487
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Sergio Ahumada [Sun, 23 Sep 2012 08:48:21 +0000 (10:48 +0200)]
Add missing QT_{BEGIN,END}_{NAMESPACE,HEADER}
Change-Id: I5f61a443b49d40c66669fa0c679df7eaab761e73
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Iikka Eklund [Thu, 20 Sep 2012 05:21:40 +0000 (08:21 +0300)]
Change copyrights from Nokia to Digia
Change copyrights and license headers from Nokia to Digia
Change-Id: Ie7f5d49ed8235d7a7845ab68f99ad1c220e64d5c
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Thiago Macieira [Sat, 22 Sep 2012 11:47:55 +0000 (13:47 +0200)]
Add QT_{BEGIN,END}_{NAMESPACE,HEADER} to qtquickglobal.h
Unit test is testing for it
Change-Id: Ie37a0f7103dbe8c19a4cfbca2d4fe026c805ba0b
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
Jerome Pasion [Fri, 21 Sep 2012 11:40:26 +0000 (13:40 +0200)]
Doc: Updated doc templates in doc/global
Task-number: QTBUG-27293
Change-Id: I37bb8ceb958d12d3670eb9db920078a585578721
Reviewed-by: Martin Smith <martin.smith@digia.com>
Jerome Pasion [Thu, 20 Sep 2012 16:33:42 +0000 (18:33 +0200)]
Qt QML: Updated qtqml.qdocconf
modified path to doc/global
Change-Id: I646b69c38381556f786e0b4346118d035cbd3648
Reviewed-by: Martin Smith <martin.smith@digia.com>
Jason Barron [Mon, 3 Sep 2012 08:42:27 +0000 (10:42 +0200)]
Avoid hanging if glGetIntegerv() fails.
If 'count' is not initialized, it could be anything and if the
call to glGetIntegerv() fails and leaves this value unchanged
then the loop could go through any number of iterations.
Change-Id: Ibdcfd018b70e265ef6aeab87a5df8c0530c653a7
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Jerome Pasion [Wed, 8 Aug 2012 10:18:55 +0000 (12:18 +0200)]
Examples: Moved example documentation.
-inline \example pages into separate .qdoc files
-fixed broken links to paths
-moved ui-components under examples/quick
Change-Id: I6e009b9213be3e1f4bed51bdbeb76a7a2142c80b
Reviewed-by: Martin Smith <martin.smith@digia.com>
Jerome Pasion [Thu, 20 Sep 2012 16:26:39 +0000 (18:26 +0200)]
Qt Quick: modified sources into documentation build
-added plugins and removed examples directory
Change-Id: I66a5037334ec7249aa44e8bfa65fe5905b296f9d
Reviewed-by: Martin Smith <martin.smith@digia.com>
Jerome Pasion [Thu, 20 Sep 2012 14:31:54 +0000 (16:31 +0200)]
Qt Quick: Updated qtquick.qdocconf
Fixed paths to sources
Added doc/global
Change-Id: I377b31eba3b790ff3e6a69b2d1fbffce0229aac6
Reviewed-by: Martin Smith <martin.smith@digia.com>
Andras Becsi [Thu, 13 Sep 2012 13:18:19 +0000 (15:18 +0200)]
Fix Flickable movementEnded() signal emission
In case the content was flicked horizontally so that the vertical
position did not change handleMouseReleaseEvent performed a fixup
for the vertical position to be an integer _before_ starting the
horizontal flick. For some large content the rounding fixup had
finished before the flicking animation started which resulted
in a premature emission of the movementEnded() signal.
This race condition did not affect vertical flicking because the
vertical animation had always been started before the horizontal
fixup was scheduled.
The issue was revealed by QQuickWebView which above a certain
velocity threshold locks the movement in one direction, thus
produces the exact same vertical position throughout a horizontal
pan gesture.
This patch removes the race condition by starting the flick
animation in either direction first then performing the
position fixup if needed.
There does not seem to be a reliable way to auto-test this.
Change-Id: Idc8fb59b0a6ead71c6cfc7083a386d51048ec50c
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Laszlo Papp [Sat, 15 Sep 2012 21:31:51 +0000 (22:31 +0100)]
Use the Module Identifier Directive to make the TimeExample correct
From the documentation:
"Declares the module identifier of the module. The <ModuleIdentifier> is the
(dotted URI notation) identifier for the module, which must match the module's
install path.
The module identifier directive must be the first line of the file. Exactly one
module identifier directive may exist in the qmldir file."
More information can be found here: Task-number: QTBUG-26551
Change-Id: Ifd2a7e9a2868ac05baed0dbde9638ce85ff5004a
Reviewed-by: Matthew Vogt <mattvogt2@gmail.com>
Kai Koehne [Mon, 17 Sep 2012 14:44:08 +0000 (16:44 +0200)]
qmlplugindump: Update help output
Qt.labs.particles 4.7 doesn't work since ages. Instead use
Qt.labs.folderlistmodel 2.0.
Change-Id: Ie11133adad88ac6120ab05aef9713f8e768f8bc8
Reviewed-by: Christian Kamm <kamm@incasoftware.de>
Frederik Gladhorn [Mon, 17 Sep 2012 14:46:39 +0000 (16:46 +0200)]
Remove outdated bic test file.
Change-Id: I41d90c8ed183f67c745ceb2ea187bb8a38c202fc
Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
J-P Nurmi [Mon, 10 Sep 2012 14:36:55 +0000 (16:36 +0200)]
Auto tests: PlatformQuirks::isClipboardAvailable()
Change-Id: I24c4417b7475ab07a47fbf5bf23d859e38b5c9ae
Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
Kai Koehne [Thu, 13 Sep 2012 12:35:42 +0000 (14:35 +0200)]
Autotests: Use qInstallMessageHandler
qInstallMsgHandler got deprecated in Qt 5.
Change-Id: Icb6423c7d9f7e507ba36376b0af5ad183379c494
Reviewed-by: Martin Jones <martin.r.jones@gmail.com>
Thiago Macieira [Sun, 26 Aug 2012 15:32:08 +0000 (17:32 +0200)]
Add a Q_UNREACHABLE to improve code generation a little
The code can't reach there anyway, so let's help the compiler out a
little.
Change-Id: Icee6ebe426c1116a7baaf2c5766c6d8f8276f3ac
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Thiago Macieira [Sun, 26 Aug 2012 15:15:00 +0000 (17:15 +0200)]
Make the instruction table be const
It's never going to be modified, so it should be const.
Change-Id: Ibc3bac0583f72ccbf7caa69aeab029bae03d3cdd
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
J-P Nurmi [Fri, 7 Sep 2012 12:47:47 +0000 (14:47 +0200)]
Remove tst_qquicktext::alignments()
These tests are not valid. Will be covered by Lancelot-based scenegraph
rendering tests: https://codereview.qt-project.org/#change,34437
Change-Id: I4e5e1b7b5b141d377e4367d143ded6abbddd52a1
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
J-P Nurmi [Fri, 7 Sep 2012 12:58:43 +0000 (14:58 +0200)]
Remove tst_qquicktextedit::alignments()
These tests are not valid. Will be covered by Lancelot-based scenegraph
rendering tests: https://codereview.qt-project.org/#change,34437
Change-Id: I5f32d09f95bab1b153c821b101599ee7d52e1867
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@nokia.com>
J-P Nurmi [Fri, 7 Sep 2012 12:55:36 +0000 (14:55 +0200)]
Remove tst_qquicktextinput::horizontalAlignment()
These tests are not valid. Will be covered by Lancelot-based scenegraph
rendering tests: https://codereview.qt-project.org/#change,34437
Change-Id: I1bb6261d7849ec00e23acce496c1e2e61152322e
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@nokia.com>
J-P Nurmi [Mon, 10 Sep 2012 15:04:42 +0000 (17:04 +0200)]
tst_v4::qtscript(): QSKIP -> QEXPECT_FAIL
Change-Id: I0a9b657b3ce81e0fc3bc788d0db64d27505eba10
Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
Jerome Pasion [Wed, 12 Sep 2012 11:52:09 +0000 (13:52 +0200)]
Qt Quick docs: Added link to the submodules' pages.
Change-Id: Ia5d8967e241e0697f2903f26899d878210dd5570
Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com>
Kai Koehne [Fri, 7 Sep 2012 13:21:00 +0000 (15:21 +0200)]
Add .qmltypes files
.qmltypes files are used by e.g. Qt Creator to provide code completion etc
for QML types defined in plugins. The added files where generated with
qmlplugindump, e.g.
qmlplugindump QtQuick.Particles 2.0 > plugins.qmltypes
(ideally make qmltypes would do the same, but it's not working as expected
right now).
The exception is the QtQuick plugin: Here the file is generated with
qmlplugindump -builtins > plugins.qmltypes
and contains also the types registered in the qml library itself.
Change-Id: I1a6b6641cb5ec3ecffe08e8926d8c1bc082ae6de
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
J-P Nurmi [Mon, 10 Sep 2012 15:42:01 +0000 (17:42 +0200)]
tst_QJSEngine::jsFutureReservedWords(): QSKIP -> QEXPECT_FAIL
Task-number: QTBUG-27193
Change-Id: Iaf0bed44374396e59ad3d7f977e3f29d7d5112ee
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Oswald Buddenhagen [Mon, 3 Sep 2012 10:06:34 +0000 (12:06 +0200)]
centralize load(qt_build_config)s in .qmake.conf
Change-Id: Ide2e054e9b5b58976410d16ca4f76fd55e61676d
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Kai Koehne [Mon, 10 Sep 2012 12:17:00 +0000 (14:17 +0200)]
qmlplugindump: Fix handling of implicit signals
Change I70affc450 added inverted logic.
Change-Id: I6cb25d3881a0487545a3eeac289a34fedcc21d8f
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Thomas McGuire [Fri, 7 Sep 2012 13:12:47 +0000 (15:12 +0200)]
Fix calculation of QML_RENDER_TIMING values
The sync time was not taken into account
Change-Id: I3d8adb637572c72438e20729a80513850a80d17e
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Alan Alpert <416365416c@gmail.com>
Thomas McGuire [Fri, 7 Sep 2012 10:42:39 +0000 (12:42 +0200)]
QML_RENDER_TIMING: Add time since last frame to output
This is quite useful to see how much time the rest of the app takes.
The same information has been available in QtQuick1.
Change-Id: I31ae91bfa764a4d8013af80de9459514ed72314f
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Thomas McGuire [Fri, 7 Sep 2012 10:31:43 +0000 (12:31 +0200)]
Add QML_RENDER_TIMING output for the single-threaded case
Change-Id: Ia3958c7c26bf2fd9dd72a07fc6f5ff3a28b0a349
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Thomas McGuire [Fri, 7 Sep 2012 08:16:39 +0000 (10:16 +0200)]
Use DEFINE_BOOL_CONFIG_OPTION for QML_RENDER_TIMING
This makes it easier to grep for.
Change-Id: I7630e05c4afddb4ab3ce1a7691466d7307325988
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Thiago Macieira [Wed, 29 Aug 2012 19:40:03 +0000 (21:40 +0200)]
Update the git-archive export options
The .gitattributes and .gitignore files do not need to be present in
packaged sources, as they are for people using the Git repository.
People who download tarballs usually don't reimport into Git -- they
should just download the actual repositories.
Meanwhile, the .tag file is quite useful. Instead of making Git extract
to the useless SHA-1 of the "$Id$\n" string, ask git-archive to store
the SHA-1 of the commit being packaged.
Change-Id: I5850800f9706dda342596a9db383e9d2c60e3c3e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Sergio Ahumada [Sat, 8 Sep 2012 15:39:02 +0000 (17:39 +0200)]
doc: fix some more typos
Change-Id: I7fa055049b9e5900d597754c6004febb153de12b
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
Sergio Ahumada [Sun, 9 Sep 2012 14:04:08 +0000 (16:04 +0200)]
test: Check for null string comparison
Do not compare a QString to QString(). Instead use the .isEmpty() method.
Change-Id: I4ef0c050f97b2070ed13d89305ad894479e42dd6
Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
J-P Nurmi [Thu, 6 Sep 2012 08:52:29 +0000 (10:52 +0200)]
tst_qquickfontloader: remove unnecessary skips on Windows
Change-Id: I319d0a5cc2387c5bc1b308e6e12a33e720a2d722
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
J-P Nurmi [Thu, 6 Sep 2012 12:35:31 +0000 (14:35 +0200)]
Fix tst_qquickanimatedimage::mirror_running()
Change-Id: I6916d90736144101b52449485b09335ac124e498
Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Sean Harmer [Sat, 25 Aug 2012 10:47:53 +0000 (11:47 +0100)]
Compile following qreal -> float change in QtGui/math3d classes
This is needed following change
https://codereview.qt-project.org/#change,33148
Change-Id: I836d4037306d1efbff48668ff8dd2b7b5ce97516
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
J-P Nurmi [Fri, 7 Sep 2012 09:10:28 +0000 (11:10 +0200)]
QtQml tests: remove QSKIP -> wrap within !QTEST_CROSS_COMPILED guards
Change-Id: I200bf6feb137e39061f144bdabd825dea70bd539
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
J-P Nurmi [Thu, 6 Sep 2012 12:55:54 +0000 (14:55 +0200)]
tst_QQuickPathView::package(): updated QSKIP()
QTBUG-21590 has been marked as resolved, but the problem persists.
A new bug QTBUG-27170 has been reported and the QSKIP() updated
accordingly.
Task-number: QTBUG-27170
Change-Id: I91d7df2588d87af833502f6c11d2e6a051e4ebb5
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Sergio Ahumada [Thu, 6 Sep 2012 21:44:08 +0000 (23:44 +0200)]
doc: fix some typos in .cpp files
Change-Id: Ica7685aefde84ec80d8af7a67541af454de4adce
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
Kai Koehne [Fri, 7 Sep 2012 09:37:19 +0000 (11:37 +0200)]
qmlplugindump: Fix dumping of types
Dumping broke with commit
70a2c049.
Change-Id: Ifbae3dbc3e2d255c1e7f8848c579c04d0bf4b48e
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Kai Koehne [Fri, 7 Sep 2012 08:43:18 +0000 (10:43 +0200)]
qmlplugindump: Take care of 'void' types
QMetaMethod::typeName() does now return "void" instead of an empty string (change
22d621dd).
Change-Id: I70affc450a7dd36b121cbcf580c0ca6fd5944f0b
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
J-P Nurmi [Thu, 6 Sep 2012 15:03:36 +0000 (17:03 +0200)]
Updated tst_QJSEngine
Replaced several QSKIP() instances with QEXPECT_FAIL() and removed
execScript from the list global object properties as it has been
removed from V8: http://codereview.chromium.org/7046002/
Task-number: QTBUG-27169
Change-Id: I28bbb38971ad80551ec24285a321e545db44a79d
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
J-P Nurmi [Thu, 6 Sep 2012 13:42:03 +0000 (15:42 +0200)]
tst_qquickflickable: fix compilation warning
warning: converting 'false' to pointer type for argument 2 of
'void QQmlContext::setContextProperty(const QString&, QObject*)'
Change-Id: Iec0f8bba115f05c7392d6654cd1f52d06ff96e97
Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
J-P Nurmi [Fri, 7 Sep 2012 09:06:59 +0000 (11:06 +0200)]
Wrap tst_qqmllocale::timeZoneUpdated() within Q_OS_UNIX to remove QSKIP
Change-Id: I9cb0da7dbca6401069f572aef15d5375aadce30d
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
Kim Motoyoshi Kalland [Wed, 5 Sep 2012 13:51:02 +0000 (15:51 +0200)]
Doc: Fix documentation issues.
Change-Id: I03c4faa1aee60cd1ad706cb6c1b983f03311d251
Reviewed-by: aavit <qt_aavit@ovi.com>
Sergio Ahumada [Thu, 6 Sep 2012 20:53:50 +0000 (22:53 +0200)]
doc: fix some typos in .qml files
Change-Id: Ice5d60b06ec9ab81fbd98fd1679c8834f3018938
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
J-P Nurmi [Thu, 6 Sep 2012 11:30:13 +0000 (13:30 +0200)]
Attempt to fix tst_QQuickListView::sectionsDelegate_headerVisibility()
Task-number: QTBUG-24395
Change-Id: I07b0fc17566e86dcebf913721f293378cf15466b
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
Sérgio Martins [Wed, 5 Sep 2012 15:43:55 +0000 (16:43 +0100)]
Fix typo in documentation.
Change-Id: I4d8d12cfce58e49789146639cc6734b6cf1643fa
Reviewed-by: David Faure <faure@kde.org>
Casper van Donderen [Mon, 3 Sep 2012 09:00:19 +0000 (11:00 +0200)]
Doc: Use settings from global qdocconf.
Depends on the integration of #34077
Change-Id: I188d7617c4805d00226d0fb8d5768a02d24c6933
Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com>
Kim Motoyoshi Kalland [Tue, 4 Sep 2012 14:25:25 +0000 (16:25 +0200)]
Doc: Fix some documentation issues.
Change-Id: I0f7e60fd6060381bd8790dfaacc3a39a890a0fe7
Reviewed-by: aavit <qt_aavit@ovi.com>
Gunnar Sletta [Fri, 17 Aug 2012 12:59:19 +0000 (14:59 +0200)]
Remove windowmanager hacks form the incubation controller.
Tie incubation directly to wether animations are running
or not. When animations are running, we incubate for
a third of a frame only. When animations are not running
we incubate whatever is left as the scene is anyway idle.
Change-Id: I88c9248e9d7b3b35c99fca52aeb9c681d1b4a306
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Thomas McGuire [Tue, 14 Aug 2012 12:19:09 +0000 (14:19 +0200)]
Delete weak JS objects on exit right away
This reduces memory leaks on exit when the engine is destroyed
after exec() has finished.
Change-Id: I917d103966d55b4dd3ba4e986ff902e29d8fb0ac
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Aaron Kennedy [Wed, 30 May 2012 09:16:13 +0000 (10:16 +0100)]
Evaluate bindings more intelligently during construction
Instead of just evaluating bindings in a fixed order, and possibly
having to evaluate a single binding multiple times, prior to reading
a property, we check if there are any bindings "pending" on it and
evaluate them then. A pending binding is one that has been assigned
to the property, but not yet evaluated.
To minimize side effects we only do this for "safe" bindings. A
safe binding is one that has no side effects, which we currently
define as not calling functions or otherwise assigning values during
its evaluation. This isn't an entirely foolproof way to ensure that
the evaluation has no side effects, but it should be good enough.
Change-Id: I98aa76a95719e5d182e8941738d64f8d409f404a
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Alan Alpert [Tue, 7 Aug 2012 07:31:46 +0000 (17:31 +1000)]
Only test qtdeclarative examples for naming convention
Change-Id: Id34e29546a22a74a7ae2ad90ee3a8deabccddddd
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Kai Koehne [Tue, 28 Aug 2012 14:49:37 +0000 (16:49 +0200)]
Fix compiler warnings from MSVC2010
Change-Id: I44eb0113374c221a166609c4fd29b5dad05ecc94
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Stephen Kelly [Tue, 28 Aug 2012 11:12:32 +0000 (13:12 +0200)]
Test metatype registration errors with non-metatypes.
QList<QPoint> is to become automatically registered
with https://codereview.qt-project.org/#change,32897
and https://codereview.qt-project.org/#change,33031
Change-Id: I455028e226c15e922162bae21db7e5e9de07063b
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Aurindam Jana [Tue, 5 Jun 2012 11:34:40 +0000 (13:34 +0200)]
Console API: Print JS object
Calling console.log(), console.debug(), print() etc would only
print out "Object" if a JS Object was passed as an argument.
This patch calls the toString() on the object.
Change-Id: Iadf8b4d1fe81c3e2c7bd65e3c153a930fd994bef
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Yuchen Deng [Sat, 25 Aug 2012 02:44:04 +0000 (10:44 +0800)]
Add doc/qtqml and doc/qtquick to .gitignore
Change-Id: I17fa26d5d1481318656b45776f38c3699e873718
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Matthew Vogt [Tue, 28 Aug 2012 05:00:42 +0000 (15:00 +1000)]
Fix property overriding lookup to exclude functions
Function overriding is required by QmlTest, and is likely to be used by
other existing QML users.
Change-Id: I04086a933456145bda5cede74aba753799feb555
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Thomas McGuire [Fri, 24 Aug 2012 13:28:46 +0000 (15:28 +0200)]
Reduce memory usage of QV4Bindings::Subscription by 8 bytes.
There is no need to store the method, as it can be calculated via
pointer arithmetic.
That leaves the active flag, which now is the last bit of the bindings
pointer.
Change-Id: I17b443e63be2d950aa80ad15cc76372b415c3dd6
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
Bea Lam [Tue, 28 Aug 2012 01:21:19 +0000 (11:21 +1000)]
Docs - add missing images and code, clean up sections
Includes the removal of concepts/modelviewsdata/localstorage.qdoc
since that is a duplicate of the existing Local Storage module docs.
Also removes classes from whatsnew.qdoc that are internal.
Change-Id: I4170c1797bbec09bb67784b0b2ad67fd990365a8
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Matthew Vogt [Tue, 28 Aug 2012 01:56:51 +0000 (11:56 +1000)]
Document the current behavior of overridden properties
Change-Id: I0d9cf0285824e05b846ffeca2d26fe573f93ccf4
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Thomas McGuire [Tue, 14 Aug 2012 09:08:33 +0000 (11:08 +0200)]
Doc: Clarify ownership semantics of objects returned by property getters
Change-Id: I8d19756e95ff02ed67b39ba4741aff4fda5896ce
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Bea Lam [Mon, 27 Aug 2012 07:04:17 +0000 (17:04 +1000)]
Fix various doc errors
Also restore the main module "reference documentation" links
added in
0e0f46c01cf6a183996d36c31987ca4a46b50bd9
Change-Id: I421f5a17e2946a2569537d8ba8a021f219aaf75a
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Martin Jones [Tue, 21 Aug 2012 04:47:48 +0000 (14:47 +1000)]
Add cacheItemCount property to PathView
cacheItemCount specifies the number of items to cache off the path when
pathItemCount is specified. This allows up to cacheItemCount items to be
kept alive when they move off the path, and also to asynchronously
create items off path in preparation for display when the path offset
changes. This is the equivalent of cacheBuffer for other views.
Task-number: QTBUG-23931
Change-Id: I03497537d3f929e5e3579536850dd43eb2724c38
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Michael Brasser [Tue, 28 Aug 2012 00:49:28 +0000 (10:49 +1000)]
Refactor QQmlPropertyCacheMethodArguments creation.
Change-Id: Ic7215741b26ddf0a36181cf7c7daaff095e797da
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
Michael Brasser [Tue, 28 Aug 2012 00:48:50 +0000 (10:48 +1000)]
Fix leak introduced in
0853343c33e394f35c31c161b019b2aed17f9256.
Change-Id: I7e23f2ba8e7ecbcfaddce1ac4224434aa5fbe69b
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
Chris Adams [Tue, 14 Aug 2012 01:44:49 +0000 (11:44 +1000)]
Refactor singleton type registration code
Previously each singleton type was registered as an implicit separate
import. This commit changes the code so that these types are treated
just like any other type in the registration sense.
It also ensures that singleton types are instantiated per-engine.
Change-Id: I5c81c4ca5bf65210f7125d74a62a282a21838068
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
Michael Brasser [Wed, 18 Jul 2012 03:53:40 +0000 (13:53 +1000)]
Update usage of smooth and antialiasing.
Change-Id: Icc8b28bdd466389ed3f269f076f1bdb6e9abe3f2
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Bea Lam [Mon, 27 Aug 2012 03:13:36 +0000 (13:13 +1000)]
Improve docs related to visual parent concept
Change-Id: I73cc63c8a55cf949b94a2fa502cb331fb8adbda3
Reviewed-by: Chris Adams <christopher.adams@nokia.com>