aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-04-0337-56/+104
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/qml/xmlhttprequest/doc/src/xmlhttprequest.qdoc examples/quick/accessibility/doc/src/accessibility.qdoc examples/quick/animation/doc/src/animation.qdoc examples/quick/canvas/doc/src/canvas.qdoc examples/quick/draganddrop/doc/src/draganddrop.qdoc examples/quick/imageelements/doc/src/imageelements.qdoc examples/quick/keyinteraction/doc/src/keyinteraction.qdoc examples/quick/localstorage/doc/src/localstorage.qdoc examples/quick/mousearea/doc/src/mousearea.qdoc examples/quick/particles/affectors/doc/src/affectors.qdoc examples/quick/particles/customparticle/doc/src/customparticle.qdoc examples/quick/particles/emitters/doc/src/emitters.qdoc examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc examples/quick/particles/system/doc/src/system.qdoc examples/quick/positioners/doc/src/positioners.qdoc examples/quick/righttoleft/doc/src/righttoleft.qdoc examples/quick/scenegraph/customgeometry/doc/src/customgeometry.qdoc examples/quick/scenegraph/openglunderqml/doc/src/openglunderqml.qdoc examples/quick/scenegraph/simplematerial/doc/src/simplematerial.qdoc examples/quick/threading/doc/src/threading.qdoc examples/quick/touchinteraction/doc/src/touchinteraction.qdoc examples/quick/views/doc/src/views.qdoc Change-Id: Idf7bb76c82acacf86b19a9f4633c3cbf4ae1a9a0
| * Doc: Spelling fix.v5.0.2Jerome Pasion2013-03-261-2/+1
| | | | | | | | | | | | | | "sufficent" -> "sufficient" Change-Id: Id46e15c3fb0a2514e8a391108065a52a18da6936 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * Add changes-5.0.2 fileSergio Ahumada2013-03-251-0/+45
| | | | | | | | | | | | Change-Id: Ifb952f46be13cd1009a82131d1eb7c17962c7118 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
| * Try to stabilize tst_QQuickPathViewSergio Ahumada2013-03-211-1/+1
| | | | | | | | | | Change-Id: I673604d4f0bc90352efe115422762c7c4ec210ad Reviewed-by: Kai Koehne <kai.koehne@digia.com>
| * Try to stabilize qquickimage and rendernode tests.Gunnar Sletta2013-03-214-21/+22
| | | | | | | | | | | | | | | | | | | | Some of Our CI machines are running on tiny screens and recent changes in Qt have caused us to limit windows to the screen geometry (which is sensible). Change-Id: I29eb3b5c73a7ea650ac26494c25d204fb254dee3 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
| * Fix duplicate examples for qml/quick modulesKai Koehne2013-03-2135-55/+58
| | | | | | | | | | | | Task-number: QTBUG-30233 Change-Id: Ic0a6d9112dbf8903d68f571e0ac853d89ff31ebe Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Fix export macros for the QML parser export.Thiago Macieira2013-04-031-1/+3
| | | | | | | | | | | | | | | | | | These classes are in the QtQml library. They shouldn't be defined to export (even if it's autotest export) when compiling other libraries, notably QtQuick. Change-Id: Id76d2b2f2c60355240edabb7875db3e97fb0da17 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | Stabilize CodeAlan Alpert2013-04-023-3/+3
| | | | | | | | | | | | | | | | | | Apparently it is no longer necessary to rely on undefined compiler behavior. Change-Id: I8e93dc0de663713c714d7894f4c66acb0aec30b4 Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | Version new signalsAlan Alpert2013-04-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | New signals added as a workaround need to be versioned as new. However, because they're used just to override the property's signals and are forwarded to the old signal you can still use the old signal names from QML. Consequently, this revision shouldn't need to be exposed to QML. Change-Id: I80407852f0a5063866c5f4334cfd0285f00d5578 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* | Provide workaround to slow glyph cache updates.Michael Brasser2013-04-022-6/+10
| | | | | | | | | | | | | | | | | | | | | | The environmental variable QML_USE_GLYPHCACHE_WORKAROUND can be specified to use the workaround path, which performs better on some hardware. Task-number: QTBUG-29264 Change-Id: I16d35ceabc12c990e4f791693ec4694f4e7f55f7 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | Use distance fields for text on retina displaysGunnar Sletta2013-04-023-4/+10
| | | | | | | | | | Change-Id: I6d3f3e7e4813155f2abb3edc51b145fb709c485b Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* | Fix incorrect merge in textureprovider example.Michael Brasser2013-04-021-1/+0
| | | | | | | | | | | | Change-Id: I5a76ab1ef77c43aecd2a03cc7d614a198290f427 Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | QmlProfiling: Test case uses port rangeAurindam Jana2013-04-021-5/+5
| | | | | | | | | | Change-Id: I45fcb8b7d496d480ad7fa72064b13c00a4bd6fa6 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Debugger: Accepts port range as argumentsAurindam Jana2013-04-0210-26/+170
| | | | | | | | | | | | | | | | | | | | Allow a port range to pass on command line, and try to listen on any of the ports in the range. (Re)using the ',' separator allows for backwards compatibility, that is, also Qt 4 will accept a -qmljsdebugger=port:1000,1010 argument, but will only try to listen on port 1000. Change-Id: Ic03fe20e4aee9ecdea86651f46f1df5cb19bd75c Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Update EtcProvider example to support configurable base url.Michael Brasser2013-04-023-4/+22
| | | | | | | | | | Change-Id: Idb047bc7bf2c9f1c62c4749cb416bdf267e66e17 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | Fix distance field antialiasing for retina displays.Gunnar Sletta2013-04-028-5/+26
| | | | | | | | | | | | Change-Id: I01d7d41a4e70822555bae453978dbe92fbb5c98d Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | Show fullscreen button in qmlscene on MacGunnar Sletta2013-04-021-1/+1
| | | | | | | | | | Change-Id: I3202e8e7461f457eeb73a82b7a8da40a11e4f76d Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* | Doc: Fix some titles and linksSze Howe Koh2013-03-3037-62/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make page titles follow the conventions at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation. Make class/type list titles follow the "<Qt Module> C++ Classes" and "<Qt Module> QML Types" formats. Links are updated accordingly, along with broken links found during this sweep. Some inline links also have their surrounding text modified, to improve flow. Change-Id: I0ed7788caa250085d7ea0080a77d8a2655debf39 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | Doc: Update module "Qt Declarative" -> "Qt Quick"Sze Howe Koh2013-03-309-11/+12
| | | | | | | | | | | | | | | | Also update examples/README to show the relationship between Qt Quick and Qt QML. Change-Id: I4e50d9f0ddb1ac25ccdfed09f579f76a375b14fe Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | Delay loading implicit importAlan Alpert2013-03-277-20/+97
| | | | | | | | | | | | | | | | As a performance improvement to avoid extra filesystem access, only import "." if it is needed for type resolution. Change-Id: If9be25deb3205f8c81f9f418404d9fb41bebb84f Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
* | Fix warning QQuickImplicitSizeItem redefines signalsv5.1.0-alpha1Caroline Chao2013-03-272-6/+8
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-30258 Change-Id: I3ab2a3ffbe22f583ac422f876be3037c07e8255d Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* | Doc: Fixed some uses of terminolgies in qdoc files.Jerome Pasion2013-03-2659-314/+287
| | | | | | | | | | | | | | | | | | | | | | -"element" -> "type" or "object" (not in all cases where this change applies) -some instances of QtQuick. It should be "Qt Quick". -only in qdoc files. Examples and source code changes will be done later. Task-number: QTBUG-30180 Change-Id: Ie587461a138e97606f761ad1e90909c91b479303 Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Bump MODULE_VERSION to 5.1.0Sergio Ahumada2013-03-261-1/+1
| | | | | | | | | | Change-Id: I3d794f16eb81634b9fe69d4fc9559be19cf3a998 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Attempt to stabilize tst_qquickanimatedspriteFrederik Gladhorn2013-03-262-4/+4
| | | | | | | | | | | | Change-Id: I557f985ca5e68eb75d0b032b1dfa28cc33d56b6a Reviewed-by: David Faure (KDE) <faure@kde.org> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Enable accessibility again.Frederik Gladhorn2013-03-224-10/+6
| | | | | | | | | | | | | | | | | | Revert "Disable accessibility temporarily." This reverts commit 361015dc73b887026e1937da09c11df89acf5c85. Change-Id: Ie1d053fe64ee79fbd9e57bf2d0d2764bb638db72 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | Merge "Merge remote-tracking branch 'origin/dev' into stable" into ↵J-P Nurmi2013-03-2224-1197/+2430
|\ \ | | | | | | | | | refs/staging/stable
| * \ Merge remote-tracking branch 'origin/dev' into stableFrederik Gladhorn2013-03-2224-1197/+2430
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | These two patches should have targeted 5.1 and went in just at the wrong time. Change-Id: Idd0a7a812fb11e2aea2c187d5e82aa31494c576c
| | * | Add Instantiator type to QtQmlAlan Alpert2013-03-2013-4/+924
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provides a dynamic instantiation type which is not tied to visual items. Change-Id: I42f7332b29b752dcc94979b6e0ec191fc76b96ef Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| | * | Optimize QQuickTextEdit for larger documents.Pierre Rossi2013-03-2011-1193/+1506
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rationale is to not end up re-processing the whole document on each update Since we know where the editing takes place, we can break down the text edit's contents in several text nodes and only re-create the affected text nodes upon editing. This requires ripping out the SelectionEngine helper class from QQuickTextNode so that QQuickTextEdit can tap into its functionality directly. A positive side-effect of this exercise is that it should be much harder to to come across GlyphNodes packing more than 16300 glyphs or so. Task-number: QTBUG-29596 Change-Id: Id29b0709baa43f5b29c44ab02398ba996be3e28a Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | | | Skip flaky FileDialog modality testShawn Rutledge2013-03-221-3/+4
|/ / / | | | | | | | | | | | | | | | | | | | | | It's been failing in CI, not just on MacOS Change-Id: Iba3ff400c0b8b6b0cc9a7c6bddd710d3f0e78964 Reviewed-by: David Faure (KDE) <faure@kde.org> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | | Merge "Merge branch 'dev' into stable" into refs/staging/stableSergio Ahumada2013-03-22662-8434/+18576
|\ \ \
| * \ \ Merge branch 'dev' into stableSergio Ahumada2013-03-20662-8434/+18576
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | This starts Qt 5.1 release cycle Change-Id: I6178a580b4c99aded1a69032a02169cff502b71d
| | * | Add QQmlApplicationEngineAlan Alpert2013-03-2017-3/+746
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This helper class exposes QML application functionality that QML-only applications want to have, but QML-using applications may not. Change-Id: If91c3f55ffa2a4aecdd9d6cc62f6ad09fd35b0dd Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
| | * | Fix multi-line string content.Erik Verbruggen2013-03-202-12/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ECMA5.1, paragraph 7.8.4, item 9 under semantics: The SV of LineContinuation :: \ LineTerminatorSequence is the empty character sequence. So, do not add any line-terminator inside a multi-line string. Escaped characters like \r and \n are added of course. Change-Id: I8c58b7971b1d1bc90adc795ea278541758246e01 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| | * | Make sure that TextInteractionFlags get set.Frederik Gladhorn2013-03-192-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The first time the function is called, it could fail to set the flags. Calling setSelectByKeyboard(true) would not actually set the text interaction flags (was == on). The test didn't detect it because it called setReadOnly before setSelectByKeyboard. Change-Id: Ia54cc782b6ad5a74f1d7029c92fa230116d034b0 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
| | * | Get rid of warning Module 'QtQuick.Dialogs'...cannot be protected...Shawn Rutledge2013-03-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After I86bc6d975223979c19d94a3fd70e4b5130b73f47 it's possible for qmldir to have the module declaration again. The reason it was absent was that src/imports/dialogs/plugin.cpp was registering new types in initializeEngine. Change-Id: I6b28a3b97df7f7817cfdc1e745c4ce6f048302f1 Reviewed-by: Liang Qi <liang.qi@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| | * | Mark renderNode test as insignificant, as CI doesn't manage to run itGunnar Sletta2013-03-191-0/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I43c2306f8b1c095140c9712821ddcc2dcea1b95d Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
| | * | Remove unused field in test class.Erik Verbruggen2013-03-191-7/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Id9bfbd1c84acb59a669908e933ed1f63a4987526 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| | * | Fix hexadecimal escape sequence validation in strings.Erik Verbruggen2013-03-197-24/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Give an error message when the sequence does not conform to the grammar. Although the specification does not explicitly state that this is an error, this is the behaviour of both JSC and V8. Change-Id: I34d189f07628bc6cc40b13bfbb8d09bee7810ced Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| | * | Remove duplicated docsAlan Alpert2013-03-181-73/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the move of docs to a separate file, this copy of docs seemed to be resurrected by mistake. Removing it and properly formatting the code. Change-Id: Id7257c232880a8829e8864af12c5b7b5c484a398 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
| | * | QQuickItem: Support FocusReason in focusNextPrevLiang Qi2013-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib1b69607e1b4b52bad6e382d8102a42553f13432 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| | * | Add ColorDialog to QtQuick.DialogsShawn Rutledge2013-03-1823-1/+1637
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As with FileDialog, it tries QPA, then QColorDialog, and falls back to a QML implementation (which is also provided here) if neither type of native dialog is available. Change-Id: I384928e1f7322bb6b867d4618d07c88c70e3cbfe Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| | * | Cosmetic changes in DefaultFileDialog and dialog shared controlsShawn Rutledge2013-03-186-61/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implementation of the button for QML-based dialogs matches the one for QML examples. The button and the text field use system palette colors, as does the file dialog. Change-Id: Ibf45d57bdab8799ae6aa69ba543c0e05c55b01d3 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| | * | Fixed invalid GLSL in openglunderqml example.Samuel Rødal2013-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First argument to pow is not allowed to be negative. Task-number: QTBUG-30191 Change-Id: Iac6c25d84e26777564d6741690aab552a0bb513e Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| | * | QQuickLoader: fix the recursion guard for size updatesJ-P Nurmi2013-03-173-3/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-30183 Change-Id: Ic8720e1e35bf2f349d74d2021dd202849da67852 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| | * | optionally bootstrap QmlDevTools and qmlminOswald Buddenhagen2013-03-165-17/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QmlDevTools is really meant for host tools (the two only ones using this being qmlmin in this repo and lupdate in qttools). qmake magic will take care of bootstrapping them while x-building. Change-Id: I29d921af483659d5455be0ad080dc1a88540c036 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * | improve dependencies of qmlparser testOswald Buddenhagen2013-03-162-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | first, this doesn't need gui. second, use qml instead of qmldevtools - there is no need to use the static library here, and after bootstrapping it would pose a real problem (testlib is not bootstrapped). on the downside, this makes the test rely on private_tests. Change-Id: Ic550fa05dcd0f3ba333850640a5b7e3fdd47d905 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * | Create common base class for declarative dialogsShawn Rutledge2013-03-1515-330/+581
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QQuickAbstractFileDialog inherits QQuickAbstractDialog, and so can the future platform dialog types. Also some header comment corrections. Change-Id: I86bc6d975223979c19d94a3fd70e4b5130b73f47 Reviewed-by: Liang Qi <liang.qi@digia.com>
| | * | photosurface example: simplify PinchArea usage; fileUrls; licenseShawn Rutledge2013-03-151-41/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FileDialog.filePaths was changed to fileUrls. No need to do so much scripting because the PinchArea.target takes care of the math already, and with better rotational symmetry too. Example QML should have a BSD license. Change-Id: I892292574c81c032d948c1c2d4924fc7127dd008 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
| | * | Add TextEdit::selectByKeyboardJ-P Nurmi2013-03-156-3/+184
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The main use case is for enabling text selection by keyboard for read-only editors. Change-Id: Ieaa9af366fd0eaf863a104a2fdf33c9ddad38b10 Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>