aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* auto-generate module prisOswald Buddenhagen2012-06-2611-100/+1
| | | | | Change-Id: I90090bcf60ecc2c3fb31a38129edeae8ff0f1c55 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* remove pointless qmltest conditionalsOswald Buddenhagen2012-06-265-14/+34
| | | | | | | | it is a module within this repository, and consequently the flag is always set. Change-Id: I8ffdd6903b1b0835725b824a9deb961d0124ce11 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* don't reference $$QT_BUILD_TREE - it's unavailable hereOswald Buddenhagen2012-06-262-2/+2
| | | | | | Change-Id: Iafef42747b07c900ae22f202c7dfc5c49a1b0f67 Reviewed-by: Alan Alpert <alan.alpert@nokia.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* don't rely on qtbase sourcesOswald Buddenhagen2012-06-261-1/+3
| | | | | | | | copied from qtquick1 Change-Id: I10f57f5563459a0784b8434a992a878fad401da8 Reviewed-by: Alan Alpert <alan.alpert@nokia.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* fix include styleOswald Buddenhagen2012-06-262-3/+3
| | | | | | | | so it builds without . in includepath Change-Id: I5815c636dfcc3d45fad70321a0aab09f5295ca8d Reviewed-by: Alan Alpert <alan.alpert@nokia.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Fix compilation with GCC 4.7 (C++11)Thiago Macieira2012-06-234-6/+6
| | | | | | | | The error was: error: unable to find string literal operator ‘operator"" STR_PORT’ Change-Id: Id4b4e64e296ffc3624be15c20f74a964e6cd1087 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Fix crash when dragging items outside visible area.Andrew den Exter2012-06-228-77/+117
| | | | | | | | | | | | | | | | | | If asynchronous item creation finishes while the content area of a ListView has been dragged full outside the visible area a full refill is triggered which can overwrite the requested index and potentially result in a single delegate item being assigned to multiple view items and later being doubly released. Only create the view item object in the createItem function to prevent this from happening. Secondly only reset the visible items if jumping outside the buffer range rather than just the fill range to prevent churn when the list only contains buffered items. Task-number: QTBUG-26232 Change-Id: I5bce845898ef5f699f34afc268594ef38e01d6a3 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix build: include the necessary headers properly.Thiago Macieira2012-06-221-0/+2
| | | | | | | | | qstrcmp is defined in qbytearray.h If QObject needs to be forward declared, then so does QMetaObject. Change-Id: I9dd3ad59ce889cee04583ead27fa760d784e5b84 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Make qmltest depend on gui-privateGirish Ramakrishnan2012-06-221-2/+2
| | | | | | | | | QWindowSystemInterface will shortly be marked as QPA API. (quicktestevent.cpp pulls in qtestkeyboard.h which uses that class) Change-Id: Id7bd03e8a97be6bf4677c8a326191b3df2675824 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Add gui-private to testsGirish Ramakrishnan2012-06-2225-25/+25
| | | | | | | QWindowSystemInterface will be marked as QPA API. Change-Id: Id174a24f8432219adf1425efe1eb59cf67d48bb9 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Pass the right signal index in visualadaptormodel proxy meta-objectKent Hansen2012-06-223-3/+5
| | | | | | | | | | For QMetaObject::activate(), the index must be relative to the class's own signals (excluding non-signal methods). For QMetaObjectBuilder, the notifier index must be relative to the class's own methods. Change-Id: I22f55d1fc55d56c997135dc78f51b710b37bb01a Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Remove insignificant_test from DropArea test.Andrew den Exter2012-06-221-2/+0
| | | | | | | | The test has not been failing on recent CI runs. Task-number: QTBUG-24588 Change-Id: I9dd29bbf1a33d9fbf042693a0995dafd887c3064 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Remove the open and closeSofwareInputPanel functions.Andrew den Exter2012-06-226-200/+4
| | | | | | | | | Functionality is provided by the global Qt.application.inputMethod object. Task-number: QTBUG-21449 Change-Id: I75c082bcbe44c8834ccaf966a3f9a09ab91ec290 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Remove stale demosAlan Alpert2012-06-22112-6416/+0
| | | | | | | Focus for Qt5 is fewer, better demos. Change-Id: Ia2b74ce4768034d8f225547ffbbc85ac5cb72845 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Install examples to example hierarchyroot2012-06-2210-22/+22
| | | | | | | | Some examples were installing to an old path of qtdeclarative/qtquick Task-number QTBUG-26205 Change-Id: I6e1840b1f1a87e24c1728de1b7320d6738bd530e Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Rename Flickable x/yOrigin to originX/YBea Lam2012-06-227-48/+51
| | | | | | | | This is consistent with the naming of other x/y properties, e.g. contentX/Y, relativeX/Y etc. Change-Id: I5159f8e54a6fda6a1f83a563ea9db47c3b8af238 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Remove properties related to highlight speedBea Lam2012-06-2210-74/+7
| | | | | | | | | | ListView should only have duration-type properties (i.e. highlightMoveDuration and highlightResizeDuration) as it's unnecessary to have both duration and speed properties for the highlight animation. (PathView and GridView only have the duration-related properties.) Change-Id: I1b94599e3e89afe6488ce2a882c2802354a859fe Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Add some tests for literal parsingMartin Jones2012-06-222-0/+68
| | | | | Change-Id: I3f3047cf27b1e5d230db0ed4154bac09e6adf087 Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* Handle enum values of -1 correctly.Michael Brasser2012-06-229-16/+36
| | | | | | | | | | This was already handled correctly most places; now the remaining cases (using an enum in ListModel, and assigning an enum to an integer property) should also work correctly. Task-number: QTBUG-21679 Change-Id: Ibff13f0b94da94b18e2e3bae4aa6ba44e0fa944b Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* Clarify anchor error messages.Michael Brasser2012-06-222-6/+6
| | | | | | Task-number: QTBUG-24625 Change-Id: Icff9fe16f053f7e79039ef31bb56cae00cdf49d1 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Add tests for clicking and dragging with right and middle buttons.Andrew den Exter2012-06-224-21/+222
| | | | | | Task-number: QTBUG-24461 Change-Id: I2c8b3455cb3aead5df7dfd85f65eb633a552b881 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Don't shadow member variable with argument.Andrew den Exter2012-06-222-3/+3
| | | | | | | | | Function argument is being written to itself rather than the member variable preventing the property from ever changing. Task-number: QTBUG-26158 Change-Id: Id204a193300c62feeb007a2ea9df89cba5e1d513 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Fix crash when selecting transformed text.Andrew den Exter2012-06-221-7/+9
| | | | | | | | | QSGClipNode cannot be used directly, a sub-class or external provider of geometry is required. Task-number: QTBUG-26234 Change-Id: I0354ec17b619886b95f7994ad5af5c96e97397a0 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* dynamiclist example used different delegate height for anim and staticMartin Jones2012-06-221-2/+2
| | | | | | | | | so delegates added later weren't the same size as the original items. Set a better value for both. Task-number: QTBUG-26206 Change-Id: Ic9d32528eb43a77e23e3a619834da098f177b5d6 Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
* Fix snake demo.Martin Jones2012-06-221-2/+1
| | | | | | | | A surrounding Item {} appeared for no clear reason. Task-number: QTBUG-26198 Change-Id: I1ddb7cc92c5ba977d85d3047c405a90cfe697a13 Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* Fix locale test on Linux and skip it on Windows.Glenn Watson2012-06-222-7/+38
| | | | | | | | | | | The timezone that V8 internally uses was not being updated at the end of one test, causing failures in subsequent tests. This was only showing up on Windows because the test was being skipped on Linux due to a typo. Skip the test on Windows due to complexity of changing the timezone (added comments in code with details). Change-Id: I47c8542111e8ddfbdeff39815c50d98570b0c6c2 Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
* Support enum return types in Q_INVOKABLE functions.Matthew Vogt2012-06-226-5/+99
| | | | | | | | | Handle enums correctly when used as the return type of a Q_INVOKABLE function. Task-number: QTBUG-23543 Change-Id: I14a506ffee08f5ba6aa0fdf27d6104a3ae5c48b3 Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* Report clashing qmldir entries for components and scriptsMatthew Vogt2012-06-228-7/+55
| | | | | | | | | | If a qmldir contains multiple lines that install the same versioned property for a single component name or script qualifier, report an error rather than silently suppress one entry. Task-number: QTBUG-25834 Change-Id: I25d3a24102a5a4fa3d82f1d31d7e52505026fff7 Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* Create new documentation structureChris Adams2012-06-21184-6779/+7453
| | | | | | | | | | | | | | | | | | | | The documentation currently has no clear separation between Qt QML and Qt Quick. With recent commits like: 6c8378eaf1edbbefe6aaa3672b0127816a004fd7 and ab1e510121c8a679fdaca12ccd30e0f7ac12a26b the separation between the language definition and implementation, provided by Qt QML, and the standard library for the QML language, provided by Qt Quick, is clear. This commit creates a new documentation structure that is more navigable and separates concepts into logical categories, with clear separation between QtQML and QtQuick. It also provides a more generic QML Application Developer Resources page which contains links to information for QML application developers. Change-Id: Ia807ccfbfd24ffa0e1c7f0a51ed9d2ed3aa6a733 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Put basic language types into QtQml importChris Adams2012-06-2116-26/+147
| | | | | | | | | | This import is automatically registered by the engine. It provides basic language types (Component and QtObject). Note that the QtQuick import still has these types registered into it, so this commit doesn't break existing code. Change-Id: I8ff190f057fc92969020cf8e896da1649ca3069b Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Fix crash in QQuickPixmapData::release()Chris Adams2012-06-211-0/+4
| | | | | | | | | | | | | | | | | Previously, if the reader was deleted (eg, via engine destruction) the reply might be deleted without letting the associated QQuickPixmapData know about it. If that data was later released, it would attempt to write to previously freed memory. This commit ensures that the data's reply ptr is set to zero when the reply is deleted by the reader dtor. It also adds a comment to the reply dtor to explain why it is important. A unit test for this issue already exists: tst_qquickpixmapcache::lockingCrash() run under valgrind. Change-Id: Icd94528e1336db1c00b118b3f6d1222eef402c46 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Disallow signal-handler-specification for non-signal methodsChris Adams2012-06-215-2/+15
| | | | | | | | | | | | | | Previously, the code which checked whether a signal handler specification was valid was incorrect, in that it only checked that a method of the appropriate name existed (rather than specifically a signal method). This commit ensures that the appropriate code is updated to check the method for signal-ness. Task-number: QTBUG-26223 Change-Id: I306f6622aaa710d86c01d5bbc5146eecce7cf2c3 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Enable literal Qt enum assignment to enum properties.Michael Brasser2012-06-214-9/+50
| | | | | | | | Assigning Qt global enums to enum properties was previously handled as a binding, rather than a literal assignment. Change-Id: If6bb65f63b34f4e10c0636221ddadb11f7025735 Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* Fix warnings in declarative tests.Friedemann Kleint2012-06-207-18/+22
| | | | | | | | | | | | - Unused variables and test data. - () around operator &&. - Conversion of false to 0-pointer where QVariant was intended. - Missing enumeration value. - Remove duplicated qqmlecmascript entry from qml.pro (has an internal check for no-widgets). Change-Id: Ie030167e22bce26e3988a4406c630fb460f61a3c Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* QtQuick: Fix warnings about deprecated QWeakPointer usage.Friedemann Kleint2012-06-202-4/+5
| | | | | | | Use QPointer for QObject-derived classes. Change-Id: Ia7be2354b8b3bbce04316185f49a80e76057a18b Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Mark tst_qquicklistview insignificant for Mac.Friedemann Kleint2012-06-201-0/+1
| | | | | | | Task-number: QTBUG-26244 Change-Id: I314fa5293ffaa72dafa843d1a950d0abed5a4516 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Cleanup SG properly in QQuickCanvasAlan Alpert2012-06-201-0/+2
| | | | | | | | | | The scenegraph renderer and root node were not cleaned up when all other SG nodes are. This leads to a possible case where the SG nodes regenerate for the canvas without being properly linked to the renderer. Task-number: QTBUG-23571 Change-Id: I19084af998cb7482bfddc87770ee9b5e0aad3a6c Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Fix binding errors in cppextensions examples.Andrew den Exter2012-06-205-1/+6
| | | | | | | | | Import QtQuick 2.0 for value type support in the examples which use QColor. Task-number: QTBUG-26207 Change-Id: I1a477f7b9ff90862d64e2d5545171728c6f97aaa Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Give the example Loader in the shared launcher focus.Andrew den Exter2012-06-201-4/+9
| | | | | | | | Allows an example to receive focus the same as if it were the root item in a scene. Change-Id: Iedd31236db50ba985aebe3bd82a5af8803dc0f17 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Fix missing content in installed calculator demo.Andrew den Exter2012-06-201-1/+1
| | | | | | | | Add the content directory to the project installs. Task-number: QTBUG-26203 Change-Id: I08b79534f522024b289724ebaba206715b8bfbea Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
* Resolve example qml file paths relative to the executable path.Andrew den Exter2012-06-201-1/+1
| | | | | | Task-number: QTBUG-26202 Change-Id: I0ef9d2aa2248c8ddfd61afcd8bca731325f8d239 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Fix compile of Same Game demo.Andrew den Exter2012-06-202-1/+2
| | | | | | Task-number: QTBUG-26204 Change-Id: I79059969033c57f82437bbec4e4323bfa0cc9430 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Fix some of the bundle test failures on Windows.Glenn Watson2012-06-202-12/+12
| | | | | | | | | | The Q_PACKED macro is not supported on Windows, so the code that serializes the bundles does not work with the loading code. Change the maximum bundle size to 4 GB so that struct packing is not required. Change-Id: Ia7c8aa856ac532732eb6e76df813f46acd66b6f2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Update example in a doc.Sukhyun Kim2012-06-201-2/+3
| | | | | | | | | There are "TypeError" errors. When using ListView.view in a delegate, the id of child of delegate has to attach in front of ListView.view to access the model and its properties in this case. Change-Id: I4610f1fc8b0d085f7cba137e76e0578be7b51e23 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Don't start running if a frame property is setAlan Alpert2012-06-203-8/+11
| | | | | | | | | | | | This fixes an error where running couldn't be reliably set, if a frame property was also being set during initialization. With this fixed, the autotest is no longer unstable. Also fixed is a related issue where start/stop/restart were active before componentComplete. Change-Id: I34c6d872f2f146d38c65167eda8c0a97525d7f4e Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Remove hardcoded qdoc3 command from qtdeclarative_doc.priChris Adams2012-06-201-3/+15
| | | | | | | | | Previously, this called qdoc3 directly, which could fail if the system path had a pre-existing qdoc3 of a different version. Change-Id: If68e00fd60594590d40f11b08416f220f0806bfb Reviewed-by: Bea Lam <bea.lam@nokia.com> Reviewed-by: Peter Yard <peter.yard@nokia.com>
* qmlscene: add --transparent argumentGirish Ramakrishnan2012-06-191-0/+14
| | | | | | | The option makes qmlscene request a format with alpha for the QQuickView. Change-Id: I6490e606dd0af534147de95783f3a2ddfa8c52c8 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Small cleanup: remove braces from single line conditionals.Robin Burchell2012-06-191-9/+5
| | | | | Change-Id: I20588ad0634aebec8374a570179ee43dd1b1dd3b Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Align windowShown flag with qml renderer stateCharles Yin2012-06-142-4/+24
| | | | | | | | | | Previously, we set windowShown to true once the window is active, this is not enough for some tests as the initial rendering may not be finished yet and will give the wrong result for some tests which require reading back pixels. Change-Id: Idd67329d207aaf1734a795b40a5bcc40093cf6b8 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* QtQuick: Fix warnings about unused variables.Friedemann Kleint2012-06-133-5/+0
| | | | | Change-Id: Ibe134810cc67e30a61b42ffa3be73f59c2ef96a2 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 16:50:49 +0000