aboutsummaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' of ssh://codereview.qt-project.org/qt/qtdeclarative into ↵Simon Hausmann2013-06-24114-241/+2830
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wip/v4 Conflicts: src/imports/qtquick2/plugins.qmltypes src/qml/debugger/qv8debugservice.cpp src/qml/qml/qml.pri src/qml/qml/qqmlcompiler.cpp src/qml/qml/qqmlcomponent.cpp src/qml/qml/qqmlcontext.cpp src/qml/qml/qqmldata_p.h src/qml/qml/qqmlengine_p.h src/qml/qml/qqmljavascriptexpression.cpp src/qml/qml/qqmlxmlhttprequest.cpp src/qml/qml/v4/qv4bindings.cpp src/qml/qml/v4/qv4irbuilder.cpp src/qml/qml/v4/qv4jsonobject_p.h src/qml/qml/v8/qqmlbuiltinfunctions.cpp src/qml/qml/v8/qv8bindings.cpp src/qml/qml/v8/qv8contextwrapper.cpp src/qml/qml/v8/qv8listwrapper.cpp src/qml/qml/v8/qv8qobjectwrapper.cpp src/qml/qml/v8/qv8qobjectwrapper_p.h src/qml/qml/v8/qv8sequencewrapper_p_p.h src/qml/qml/v8/qv8typewrapper.cpp src/qml/qml/v8/qv8valuetypewrapper.cpp src/qml/types/qqmldelegatemodel.cpp src/quick/items/context2d/qquickcanvasitem.cpp src/quick/items/context2d/qquickcontext2d.cpp sync.profile tests/auto/qml/qjsengine/tst_qjsengine.cpp tests/benchmarks/qml/animation/animation.pro tools/qmlprofiler/qmlprofiler.pro Change-Id: I18a76b8a81d87523247fa03a44ca334b1a2360c9
| * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-201-0/+28
| |\ | | | | | | | | | Change-Id: I5cc2cacd26004ba18f0c6214759f5e073b5c6cfb
| | * fix case insensitive issue with image provider idTasuku Suzuki2013-06-181-0/+28
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-31614 Change-Id: I866df6e3ed6226b443640a51f66a3dbb92b31249 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
| * | Add QQuickText::hoveredLinkJ-P Nurmi2013-06-181-49/+119
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-30804 Change-Id: I6c6993b152285f4bdf34d6e1aa04f25fa7ca41e0 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
| * | Set default font size to 10px as per spec, not 10pt.Mitch Curtis2013-06-141-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See: http://www.w3.org/TR/2dcontext/#dom-context-2d-font Also removes duplicated assignments that are done as part of the default constructor. Task-number: QTBUG-31716 Change-Id: I5bd131c14a5defd422d858f02974c215de7adae9 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| * | Allow floating point pixel sizes for Context2D, don't set if invalid.Mitch Curtis2013-06-141-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, setting a floating point pixel size for context2d's font will result in the following error: QFont::setPixelSize: Pixel size <= 0 (0) This is because qt_font_from_string() uses toInt() to convert the number to an int, which fails because of the decimal fraction. The font size is then set regardless (to 0), which does not comply with the standard: "[...] If the new value is syntactically incorrect (including using property-independent style sheet syntax like 'inherit' or 'initial'), then it must be ignored, without assigning a new font value. [CSS]" [1] This patch makes qt_font_from_string() call toFloat() on the string and then casts the value to an int. I could not find any evidence that floating point pixel sizes are disallowed, and QFont only deals with integer sizes anyway. If the conversion to float fails, the font size is not set (it defaults to 10px, according to [2]). [1] http://www.w3.org/TR/2dcontext/#dom-context-2d-font [2] http://qt-project.org/doc/qt-5.0/qtquick/qml-qtquick2-context2d.html#font-prop Change-Id: I6204eaa9fb6048bb9c4452403c3a4cf2913a03a1 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-126-19/+113
| |\| | | | | | | | | | Change-Id: I045587eac266e9b6296d9cd9e3c73031fe18bbd1
| | * support url type qml property as a source for Context2D::drawImage()Tasuku Suzuki2013-06-101-0/+11
| | | | | | | | | | | | | | | Change-Id: I66445dafd64f6c47fe1098fadd83bf3af301e58d Reviewed-by: Alan Alpert <aalpert@blackberry.com>
| | * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-06-103-14/+83
| | |\ | | | | | | | | | | | | Change-Id: Iafc0497812acb7850cd4e72c49d63ec9c9320b58
| | | * Stabilize tst_qquickanimatedimage::mirror_notRunning()Gunnar Sletta2013-06-041-10/+6
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-31370 Change-Id: I200d94dccd1314c891df92576b0d2b704e530e16 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | | * QQmlPropertyCache: check methods before propertiesAlberto Mardegan2013-05-311-2/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When creating the QQmlPropertyData, search within the methods list before searching for properties. The reason is that if the meta object is dynamic, looking up a property will always return a result (if the property doesn't exist, it will be created) and therefore all methods will be obscured. By swapping the search order, we eliminate this risk (methods are not dynamically added). Task-number: QTBUG-29836 Change-Id: Ie367f757c37ef4bc834a6c1c009f27bcf344fe76 Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
| | | * Fallback to QMetaObject for properties not in QQmlPropertyCacheAlberto Mardegan2013-05-311-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QQmlOpenMetaObject does not update the QQmlPropertyCache when new properties are added, meaning that the QQmlPropertyCache might not contain all of the dynamic properties of an object. Therefore, make QQmlPropertyCache fallback to reading the QMetaObject when a property is not found. Task-number: QTBUG-31226 Change-Id: I760aaa155b1952f6f52ab9ce173fb9547f8e34a6 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
| | | * Stabilize tst_touchmouseGunnar Sletta2013-05-311-2/+18
| | | | | | | | | | | | | | | | | | | | Change-Id: I6d34571b85f99f780b03f7871f39dbf3be546006 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | * | Autotest: Update textedit test using textFormatCaroline Chao2013-06-082-5/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TextEdit does not support the StyledText format, Text does. Add an autotest to Text to check the line counts using different text formats. Task-number: QTBUG-31191 Change-Id: I4670f9155bea295ba85f410988d9636eac12842c Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au> Reviewed-by: Liang Qi <liang.qi@digia.com>
| * | | Add QQuickTextEdit::append()J-P Nurmi2013-06-121-0/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it possible to append text more efficiently than appending to the text -property, and also avoids weird rich text formatting issues with the latter approach. Task-number: QTBUG-31575 Change-Id: Id621773588b94e36f8f0b9eb6b22590e9db62811 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
| * | | fix Folderlistmodel "showDotAndDotDot" didn't show "."Tasuku Suzuki2013-06-102-2/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-29858 Change-Id: Ia736776e2587601a80d0aef22bb5cfce74040d39 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
| * | | Add QQuickTextEdit::hoveredLinkJ-P Nurmi2013-06-072-7/+18
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9d75a97c86e047742514f942cdb91c70f1d7a9a2 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
| * | | Make TestHTTPServer header comparison order independent.Jonas Gastal2013-06-072-22/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The order of headers in an HTTP request is irrelevant and program behavior should not depend on it. Change-Id: I77e1b6265ceed8a38f04e425ba8e6eb70b5227f1 Reviewed-by: Richard J. Moore <rich@kde.org> Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
| * | | Fix compilation of QML benchmarksPeter Varga2013-06-0610-27/+24
| | | | | | | | | | | | | | | | | | | | Change-Id: I2d612108ec8d69a0a9318cd26f6adcbb74f34138 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * | | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2013-06-052-0/+24
| |\| | | | | | | | | | | | | | refs/staging/dev
| | * | Fix assert when calculating the implicit width of truncated lines.Andrew den Exter2013-05-312-0/+24
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | Guard against reading past the end of the final line. Task-number: QTBUG-31471 Change-Id: I489f742936ee16f12ad9762b7c0891bfa9377e21 Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
| * / Don't remove milliseconds now that toString() includes them.Mitch Curtis2013-06-051-2/+0
| |/ | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes a test failure introduced by 15da0a5af20fe6771bcb94ef8d46edbd5c8fb64c. tst_QJSEngine::dateConversionJSQt and tst_QJSEngine::dateConversionQtJS removed milliseconds from the JS-converted datetime, as QTime::toString() previously did not include them. Now it does, so we can remove this code. Change-Id: I48604a2eb4ed854665c9c9a24ba7b03657fea116 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| * Prevent tab focus from wrapping endlesslyLiang Qi2013-05-273-0/+159
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there was no item that accepted focus, it would go into an endless loop. This also changes the default behavior of QQuickWindow. When there is not any activeFocusItem in the whole window, it means the contentItem got focused. The Tab/BackTab key will now focus the next item in the tab focus chain. Autotest is included. Done-with: Frederik Gladhorn <frederik.gladhorn@digia.com> Task-number: QTBUG-31344 Change-Id: I854292f89a327c493eec21969907c94aa9cfddcb Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * skip failing qquickanimatedimage mirror tests for nowShawn Rutledge2013-05-271-0/+6
| | | | | | | | | | | | | | | | Failing on mac, which is a blocker for CI. Task-number: QTBUG-31370 Change-Id: Icb42bb5ae59510a8754de895070d7a3d08af2623 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * QmlProfiler: fix SceneGraph profilingChristiaan Janssen2013-05-271-1/+1
| | | | | | | | | | Change-Id: I54c960f0b0da061816223a51795c83a9f9dd3f66 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
| * Partial fix for deferred properties when combined with componentsAlan Alpert2013-05-224-0/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current deferred properties implementation did not store context or compiled data pointers correctly. Those pointers are now stored when the defer is reached, so as to avoid confusion (confusion leads to asserts or crashes). Does not extend the deferred property support to allow multiple deferred blocks per item. This now prints and error and the side effect is only that one of the deferred blocks is lost. This use case is sufficiently rare that it may not be worth the cost. Task-number: QTBUG-30325 Change-Id: I80cb074ed4452e95020208a0142a91e721bced7d Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * Re-enable qmltest on MacLiang Qi2013-05-222-2/+7
| | | | | | | | | | | | | | | | | | Only tst_fontloader.qml fails on Mac, and we have useful Qt.platform.os. Task-number: QTBUG-25306 Change-Id: I6f4082028a188453378ad7ef73f51b1df2d89f11 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * Autotest: fix misuses of tryCompareCaroline Chao2013-05-224-29/+29
| | | | | | | | | | | | Change-Id: Ia06527a0a3c3cfd68ecb3372316de476e02e6c26 Reviewed-by: Albert Astals Cid <albert.astals@canonical.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
| * Tools: unnecessary to make qmlplugindump a bundleLiang Qi2013-05-201-3/+1
| | | | | | | | | | | | | | | | Embed Info.plist in qmlplugindump executable in a special way. Change-Id: I7eb73d0f832ab53d352c1fd2275f77e853269c2c Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
| * Mac: respect the system settings in Full Keyboard AccessLiang Qi2013-05-142-0/+276
| | | | | | | | | | | | | | Iterate all or not in nextPrevItemInTabFocusChain function. Change-Id: I95289b042f3d9924c28ffb9c8c7124c767addf2e Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * Revert "Mac: respect the system settings in Full Keyboard Access"Liang Qi2013-05-082-276/+0
| | | | | | | | | | | | | | | | | | This breaks Qt Quick Controls activeFocusOnTab autotests. This reverts commit 305616a60462b668c4d0b3d19302fa90469aceb5. Change-Id: Ided59ebe99659b23e950e8269ccaa8d7d44a4fdb Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * The resources property should be independent from QObjectThomas Hartmann2013-05-082-13/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resources was a direct mapping of the QObject children. This led to problems since the QObject children can also contain other objects from other sources like attached properties. This patch decouples resources from QObject properties and also does not call setParent() anymore. The special case for QQuickWindow in data_append does rely on the fact that QObject::setParent() is called and the inner window becomes a QObject::child of the content item. So we keep the setParent for this special case. The children property does not take QObject ownership either. QObject ownership is handled by the VME. None of the documented QML use cases should be touched by this change. This is a cleaner solution then the ad hoc fix provided by https://codereview.qt-project.org/#change,54677 I changed also the test. The list count now has to be exactly 4. Change-Id: I5c119e333ee82e888aaac1da559fd63a875d08ee Reviewed-by: Liang Qi <liang.qi@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
| * adjust to new "configure -nomake tools" semanticsOswald Buddenhagen2013-05-081-0/+4
| | | | | | | | | | Change-Id: I34ea6a8ea5f6f2641bf5deaf2a7136e5ed51a8ba Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
| * fix debug/release library name mixup on mac/winOswald Buddenhagen2013-05-081-2/+5
| | | | | | | | | | | | | | Task-number: QTBUG-30676 Change-Id: I5c5869ee3050e67390607f94054127bd62ab2ea4 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Liang Qi <liang.qi@digia.com>
| * Add QQuickWindow::closing signal, and ability to ignore the eventShawn Rutledge2013-05-082-0/+53
| | | | | | | | | | | | | | | | | | | | | | An application can implement onClosing() and set closeEvent.accepted = false to delay the closing (for example to prompt the user to save changes). Depends on change I9abed47fca02a002b78727f98d678a824854adfc in qtbase. Task-number: QTBUG-31019 Change-Id: Icfd4a03ecef3621bdbbee2e2c3157b897a9b6524 Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
| * Mac: respect the system settings in Full Keyboard AccessLiang Qi2013-05-082-0/+276
| | | | | | | | | | | | | | Iterate all or not in nextPrevItemInTabFocusChain function. Change-Id: I14d40dbeda01ca470efe23886789383ff1d30c0f Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * Add qmlClearRegisteredTypes FunctionAlan Alpert2013-05-0712-0/+409
| | | | | | | | | | | | | | | | | | | | | | Registered types are stored in a global static variable, not on an engine instance. For applications managing multiple engines over their lifetime, there needs to be a way to clear the existing types so they can register new ones and avoid memory leaks. Task-Number: QTBUG-28572 Change-Id: Ic70a4dd1e29d99399b21fb42eaf10d4a52bf2adf Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
| * Add a URL interceptor to the QML engineAlan Alpert2013-05-0722-0/+216
| | | | | | | | | | | | | | | | Allows for custom file handling to a greater extent than the QNetworkAccessManager. Change-Id: Ifd3946bf33530c40ca2edeeb9f441f712e4941f6 Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>
| * QmlProfiler: SceneGraph profilingChristiaan Janssen2013-05-062-0/+97
| | | | | | | | | | Change-Id: Ide71b330b13fc3816ed191bd9af84e0fce0d9587 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
| * Tests: add qmlCreateWindow in tst_qqmlcomponentLiang Qi2013-05-042-0/+39
| | | | | | | | | | | | Task-number: QTBUG-30919 Change-Id: I474a327e057978356a4ae395d8f59a66afaf2f7f Reviewed-by: Alan Alpert <aalpert@blackberry.com>
| * Protect against null item at QQuickItemView::destroyingItemAlbert Astals Cid2013-04-302-1/+116
| | | | | | | | | | Change-Id: I92317d8f5a6d6f60160139f7486ffa8ec5985656 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
| * Added doc and test for active and requestActivate in QQuickWindowLiang Qi2013-04-303-0/+82
| | | | | | | | | | | | | | | | Autotest is included. Change-Id: I0f8614b502f1e51cab5612fee283c929e078108b Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> Reviewed-by: Liang Qi <liang.qi@digia.com>
| * QmlProfiler: Pixmap CacheChristiaan Janssen2013-04-306-0/+95
| | | | | | | | | | Change-Id: Ibc237bb162c24030438b89d54fa8802ee66b080a Reviewed-by: Kai Koehne <kai.koehne@digia.com>
| * QQmlVMEGuard is not ok if one of the context engines is goneAlbert Astals Cid2013-04-292-0/+103
| | | | | | | | | | | | | | Task-number: QTBUG-30632 Change-Id: Idff323f5b29688477e31030111d4f49f644115cd Reviewed-by: Alan Alpert <aalpert@blackberry.com>
| * Fix hover after press eventFrederik Gladhorn2013-04-272-0/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a mouse press event was rejected, we would unconditionally cancel the hover and claim that the mouse is not contained any more. Instead check if the mouse left and only then cancel the hover state. Task-number: QTBUG-30783 Change-Id: I5fac6f3a1f2807ef03e07982c603492d40d2a249 Reviewed-by: Florian Boucault <florian@boucault.net> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
| * No longer apply pending changes when accessing ItemView propertiesAlan Alpert2013-04-266-39/+157
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Implement QQuickWindow::grabWindow() for isVisible=falseGunnar Sletta2013-04-261-2/+16
| | | | | | | | | | | | | | Webkit uses this for testing. Change-Id: I4539e169a02592fb6c0062903917d4dd23a4303c Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
| * Doc: Replace some references to NokiaSze Howe Koh2013-04-241-1/+1
| | | | | | | | | | | | | | Link to internal QDoc pages, or to qt-project.org Change-Id: I5d9adae711213873ab57ccfc5bb2d8f74cf5689b Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Fix tst_qqmldebugjs and tst_qquickfolderlistmodel build for WinCE.Janne Anttila2013-04-242-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Doc: Fix module name formatSze Howe Koh2013-04-232-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | 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>