aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Accept missing semicolon after do-while statement.Erik Verbruggen2012-11-269-867/+970
| | | | | | | | | Although not valid according to ECMA 5.1, both JSC and V8 accept a missing semicolon after a do-while loop. (Both JSC and V8 do not do this through automatic semicolon insertion, but handle it as a special case.) Change-Id: Iff2b07b894564740d2dcbf9b1d46bc279d30b9e3 Reviewed-by: Alan Alpert <aalpert@rim.com>
* Enable module build with QT_NO_IMTasuku Suzuki2012-11-2621-11/+287
| | | | | | Change-Id: I90f8ec7e6357db7b4038bb1646fe9d3835821556 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Alan Alpert (RIM) <aalpert@rim.com>
* Enable mobule build with QT_NO_TRANSLATIONTasuku Suzuki2012-11-269-4/+32
| | | | | | Change-Id: Id7aeef0d499f48ddc64b4ea3e4dc713db8458c38 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Alan Alpert (RIM) <aalpert@rim.com>
* Fix deployment docs.Lars Knoll2012-11-261-9/+13
| | | | | | | Qt Quick is not dependent on widgets. Change-Id: Icd7ab72d9558905ac6d3790faa0248b0d197ea8c Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* QQuickWindow cannot rely on QWindowPrivate.geometryShawn Rutledge2012-11-261-2/+3
| | | | | | | | | | because sometimes geometry has been set on the platform window and sometimes it's only stored in the QWindow geometry, waiting for the asynchronous confirmation. So it should call QWindow::geometry() instead. Change-Id: Ifa54792be31440108fae212240a46ae269393eb7 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Nested Flickables with pressDelay flick incorrect FlickableMartin Jones2012-11-263-18/+69
| | | | | | | | | | | If the gesture is triggered within the pressDelay the outer Flickable will always handle the gesture. When the drag distance is exceeded replay the press event to allow all Flickables an opportunity to process the gesture normally. Task-number: QTBUG-28189 Change-Id: I36912cc19a48c90ae7a9a430580a8f40071bd5fd Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
* Reduce number of relocationsMarc Mutz2012-11-233-15/+15
| | | | | | | ...by turning pointer into array variables. Change-Id: Ia5a0cedcf28d54210cc1f179db5c519e7e0672cc Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Declarative examples: fixed particles/imageparticle exampleChristiaan Janssen2012-11-232-2/+4
| | | | | Change-Id: Idec210a23e85f1460652f938c72aea7b5a2a2458 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Declarative Examples: improved buttons in particles/wander exampleChristiaan Janssen2012-11-232-3/+85
| | | | | Change-Id: I5c8019e702d848c8ec61ea850502c68f378c44fe Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Support requestPixmap if platform has ThreadedPixmaps featureAlbert Astals Cid2012-11-232-8/+27
| | | | | | | | | As discussed with Samuel enable the use of requestPixmap in a thread for async requests if the platform support ThreadedPixmaps Task-number: 28138 Change-Id: I106cf0123430115464b0a75071c7e6129a98d22b Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* QtDeclarative: fixed modelviews exampleChristiaan Janssen2012-11-232-15/+27
| | | | | Change-Id: I3d31beb6a23b7c74061cf66d3c13616911cda7c6 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Stop using the name "trolltech" in interface nameTasuku Suzuki2012-11-231-1/+3
| | | | | | Change-Id: Ie30146415c99700c1b55fb2f01331ec9b1a42359 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* docs: Separate qml and c++ examplesFrederik Gladhorn2012-11-231-1/+13
| | | | | Change-Id: I1d9e2e281bff2bb77a8bdf53726d3c452e3fe911 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* make module compile with -no-guiTasuku Suzuki2012-11-228-15/+26
| | | | | Change-Id: I106cf0933930115464b0b7507177e6129098d22b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Doc: Adding "qtgui" to the documentation dependency.Jerome Pasion2012-11-222-2/+2
| | | | | | | | -Qt Quick and Qt QML depend on Qt GUI and its documentation. Change-Id: Icf14107490bf7a884a5e5840d7ec7bdd62e1cf09 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Improved documentation of Text.textFormat property.Samuel Rødal2012-11-221-1/+5
| | | | | | | | Even though using RichText is not recommended, we should still at least point out what it does. Change-Id: I96d0e1e7074b5fdbb3a5dcaf84e5afe805c92080 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Fix installation of examples.Christian Kandeler2012-11-2259-94/+218
| | | | | | | | | | Enable examples to be built in the target tree. This entails installing the project files and possibly other missing stuff. Task-number: QTBUG-27977 Change-Id: I159fd8e3ebc7077e1d68e085c4947acc058ce594 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: hjk <qthjk@ovi.com>
* Add designer support for animations and componentCompleteMarco Bubke2012-11-227-18/+52
| | | | | | | | | In the designer animations confuse users, if you change a state or move a item around. Also component complete is called later by the designer. The call in the VME is to early. Change-Id: I49aa04edbc49fb44ddb7b52062307982865efd7e Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Fix security warning about passing a variable to printf-formatting.Friedemann Kleint2012-11-221-1/+1
| | | | | Change-Id: I7ea8ff54d24fe0818cd216d4aac0e8970461306e Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Expose QMatrix4x4 properties as mat4 uniforms in shadersChris Adams2012-11-222-0/+10
| | | | | | | | | | Previously, QMatrix4x4 properties were not exposed as uniforms in shaders. This commit adds conversion code for matrix 4x4 properties so that they are automatically converted to mat4 uniforms. Task-number: QTBUG-27952 Change-Id: I9b1de39fbbcb02743cf8c4e09b4d83c44f1dd438 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Aesthetic tweaks for qmleasing UIAlan Alpert2012-11-212-1/+2
| | | | | | | Add window title and shrink import button. Change-Id: Ic35b03c1b7d24fc4c3ca1dc237445474ecf3a213 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Unify qmleasing and easingcurveeditorAlan Alpert2012-11-2120-450/+202
| | | | | | | | | | | | Keeping the name qmleasing, but most of the code from easingcurveeditor. easingcurveeditor had more UI and functionality, as qmleasing could only import AfterEffects curves. That functionality has now been added to easingcurveeditor. Change-Id: Iac1a004f13fe33a18449af1b08bd22138d525322 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Christopher Adams <chris.adams@jollamobile.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Deliver parameters to bound signals.Frederik Gladhorn2012-11-211-0/+1
| | | | | | | | | | | | | | In the following property change "mouse" would be undefined since the number of parameters was not correctly evaluated. PropertyChanges { target: mouseArea onClicked: console.log(mouse) } Task-number: QTBUG-27300 Change-Id: Ie3fb9a49155312af1feb5c7ff67d78e019925130 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Ungrab mouse upon leave event.Frederik Gladhorn2012-11-212-7/+9
| | | | | | | | | | The event signals that the mouse has left the window. This happens also when a popup is shown (overlapping the original window). Before a mouse area would still think it was in pressed state when the popup (QWindow/QMenu) was shown and even after the popup was closed. Change-Id: I6d32571f5a473610f60e9476850989ff665edb93 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Document importing issues in worker scriptJędrzej Nowacki2012-11-212-0/+3
| | | | | | Task-number: QTBUG-27454 Change-Id: Ia9f384ab92fe0c55d3299d32a3f7faba1446ce35 Reviewed-by: Alan Alpert (RIM) <aalpert@rim.com>
* Refactoring samegameFabian Bumberger2012-11-2010-89/+178
| | | | | | | This patch cleans up the example and makes it more customizeable by adding a setting file. Also a bug has been fixed, where the "New game" button could not been clicked. Change-Id: Ia397258721dfcf4900e3ed1e176a257eccfad354 Reviewed-by: Alan Alpert (RIM) <aalpert@rim.com>
* Fix syncqt-warnings.Friedemann Kleint2012-11-204-5/+5
| | | | | | | Use include with module name in the public headers. Change-Id: I50d3767a5538bc3f935ebf61b56894c8f0461981 Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
* Merge branch 'newdocs'Eskil Abrahamsen Blomfeldt2012-11-20116-2213/+251
|\ | | | | | | Change-Id: Idd7a9837e4f6a1358edf9accdcdc3c71822f4c25
| * Doc: Moved all content in the doc directory.Venugopal Shivashankar2012-11-08113-2206/+247
| | | | | | | | | | | | | | | | | | - most images to the corresponding examples directory - Fixed a few broken links to the examples and qdoc pages - removed the obsolete and unused images and qdoc pages Change-Id: I18f9551b42ec713b81e3f69694a2bd04b1ebf794 Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
| * Merge branch 'master' of ssh://codereview.qt-project.org/qt/qtdeclarative ↵Jerome Pasion2012-11-02131-788/+1013
| |\ | | | | | | | | | | | | | | | into newdocs Change-Id: Icced038fbdb309d8928213d3753a27fe5a6b1137
| * | Doc: Removed the HTML template from the .qdocconf filesJerome Pasion2012-10-292-3/+0
| | | | | | | | | | | | | | | | | | | | | -qt-module-defaults.qdocconf already contains the HTML template. Change-Id: I8ecac8e959d0fe8705295f4c9a58dd6b98ca1a44 Reviewed-by: Martin Smith <martin.smith@digia.com>
| * | doc: fix some typos.Alexandr Akulich2012-10-221-4/+4
| | | | | | | | | | | | | | | Change-Id: I951d89094a6d49e4c71aa9a50e98f3ccc1ca62e1 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* | | Fixed memory leak of registered QML modulesVadim Zakondyrin2012-11-191-0/+4
| | | | | | | | | | | | | | | | | | Change-Id: I254f755641f5ac8383e5818b5294ec85fd9236e8 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
* | | Use the new QLibraryInfo::Qml2ImportsPath path for QML 2.Thiago Macieira2012-11-194-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also change the environment variable to be QML2_IMPORT_PATH. This splits the imports from QML 1 (the QtDeclarative library). Change-Id: Icadbf96283b1cf071ed0deb04e8c8476da664009 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Christopher Adams <chris.adams@jollamobile.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | | Allow margin changes during Flickable drag operationMatt Vogt2012-11-191-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the dimensions of the flickable were captured at mouse press and reused during dragging, which causes problems if the margins of the Flickable are altered during the drag. Adjust the captured values so that margin changes are correctly handled. Change-Id: I1ce608dcc1302ea8639bf18a81361b27749b217b Reviewed-by: Martin Jones <martin.jones@qinetic.com.au>
* | | Update gettingStartedQml example code to use standard Qt coding stylehjk2012-11-165-86/+80
| | | | | | | | | | | | | | | Change-Id: I225ea53a4e06e92367feb368dd6deea6f9acf403 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | | Use threaded renderer even without BufferQueueingOpenGL.Samuel Rødal2012-11-161-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without threaded rendering QML 2 often ends up running at half the screen refresh rate on X11. Not having BufferQueuingOpenGL shouldn't prevent us from using threaded rendering, since the issue of four animating windows running at 1/4th of the screen refresh rate will happen regardless of whether rendering happens on the main thread or in a separate rendering thread. Change-Id: I0edc818e6d762fa1faf13e7f2f47dfda132b6fdf Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | | Accessibility: add stepSize to value interface.Frederik Gladhorn2012-11-152-0/+6
| | | | | | | | | | | | | | | Change-Id: I4c654837c37dbef8f6f407387ce4ea82cb3b821b Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* | | QuickTest: Remove reference to /tests/qmlautoKai Koehne2012-11-141-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | There's no tests/qmlauto in the source tree, neither could I find an example using QUICK_TEST_SOURCE_DIR. Task-number: QTBUG-27919 Change-Id: I5a4ba5653a06e448a922a47900ae3f2d12e3020c Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | | Fix StocQt example - need full 4-digit years for yahoo APIShawn Rutledge2012-11-131-2/+2
| | | | | | | | | | | | | | | Change-Id: Id5f6895c3e4c901af3e4e45ca8a1474c9fdb19d9 Reviewed-by: Alan Alpert (RIM) <aalpert@rim.com>
* | | Deduplicate checking of conditions.Alexandr Akulich2012-11-121-2/+2
| | | | | | | | | | | | | | | | | | Change-Id: I0621db17db2bb8fe885a3a65f6a7a042279c3752 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | | Improve documentation.Frederik Gladhorn2012-11-101-3/+4
| | | | | | | | | | | | | | | Change-Id: I9bfb8bf8167e3b55d3539dc35e4278b5514119c8 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | | Preparation for changing QWindow::windowState to visibilityShawn Rutledge2012-11-101-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | QQuickWindow needs to avoid depending on QWindowPrivate::visible. It can go back to using private variables after the replacment is done. Change-Id: I38b99df8b4ef0139c9eadcbb07d33d3f1894a8ac Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | | Window example tests Qt.application.supportsMultipleWindowsShawn Rutledge2012-11-101-1/+3
| | | | | | | | | | | | | | | Change-Id: I7fcdd518e56427316f454ff4e5b298d13b396ac0 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | | Blackberry: Workaround for GLSL compiler bug.Fabian Bumberger2012-11-092-0/+10
| | | | | | | | | | | | | | | Change-Id: If3ce968c0a0a2af4244671fe028a560843c9016a Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | | Examples and fixes for QML Window propertiesShawn Rutledge2012-11-094-17/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | Setting Window.color in QML takes effect immediately. It was only possible to set the property at startup. Examples demonstrate new Window property features. Change-Id: Ic5b43d0d84371f3fe5c42223ccc98e6de27aed10 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | | Renamed QWindow::pos property to positionShawn Rutledge2012-11-092-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Abbreviated properties are to be avoided, and this is a new class so we have a good opportunity to avoid it before the release. Related to qtbase change I19c00b54b1d2712f9418e8bcf56e35a8008b89ef Change-Id: Ibd5cd10814c8cbd2b1f6e49b70782c7768d2366d Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | | Install the Qt Quick 2 examples in the "qtquick" dirThiago Macieira2012-11-0943-87/+87
| | | | | | | | | | | | | | | | | | | | | | | | Leave the "qtdeclarative" dir for Qt Quick 1, which is where it used to be in Qt 4. Change-Id: I44997771d77617564fc608c1aba95e3ada8f9a69 Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
* | | Don't install tst_qmltest to $QTDIR/testsKai Koehne2012-11-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Don't try to install the tst_qmltest by default, since it will install itself to $QTDIR/tests. Task-number: QTBUG-26661 Change-Id: I310f660cc486ffb4358af14ea15db389375ed802 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* | | tests: Mark some tests as insignificant on MacSamuli Piippo2012-11-092-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-27890 Change-Id: I48edea29ccaa593e4bab61c1a968130a5d3457f3 Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>