aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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-2640-251/+236
| | | | | | | | | | | -"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>
* Enable accessibility again.Frederik Gladhorn2013-03-223-9/+5
| | | | | | | | | Revert "Disable accessibility temporarily." This reverts commit 361015dc73b887026e1937da09c11df89acf5c85. Change-Id: Ie1d053fe64ee79fbd9e57bf2d0d2764bb638db72 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Merge remote-tracking branch 'origin/dev' into stableFrederik Gladhorn2013-03-2216-1196/+2171
|\ | | | | | | | | | | | | 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-205-3/+665
| | | | | | | | | | | | | | | | | | 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>
* | Merge branch 'dev' into stableSergio Ahumada2013-03-20406-6178/+11838
|\| | | | | | | | | | | This starts Qt 5.1 release cycle Change-Id: I6178a580b4c99aded1a69032a02169cff502b71d
| * Add QQmlApplicationEngineAlan Alpert2013-03-206-2/+469
| | | | | | | | | | | | | | | | 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-201-12/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Fix hexadecimal escape sequence validation in strings.Erik Verbruggen2013-03-192-22/+39
| | | | | | | | | | | | | | | | | | 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>
| * 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-1822-1/+1528
| | | | | | | | | | | | | | | | | | 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>
| * QQuickLoader: fix the recursion guard for size updatesJ-P Nurmi2013-03-171-3/+6
| | | | | | | | | | | | | | | | 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-161-1/+8
| | | | | | | | | | | | | | | | | | 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>
| * 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>
| * Add TextEdit::selectByKeyboardJ-P Nurmi2013-03-154-2/+54
| | | | | | | | | | | | | | | | | | 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>
| * QQuickWindow: expose activeFocusItem as a propertyJ-P Nurmi2013-03-152-0/+12
| | | | | | | | | | Change-Id: Ifd393399f93b04313cd66d7873fb99b505640c8a Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
| * QQuickView's equivalent in QtQuick1 is QDeclarativeViewDebao Zhang2013-03-151-1/+1
| | | | | | | | | | Change-Id: I12104e8bd58a406a0ff03c110e2df54bbc1c816c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| * Move QML types to types folderAlan Alpert2013-03-1427-35/+36
| | | | | | | | | | | | | | | | | | The QtQml module has gain a bunch of QML types cluttering up the qml folder. Moving them to types organizes them a bit better. Change-Id: I570884c00f4abc48f4f1aea048bf002bc70223f3 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * Add some docs, improve scope of var.Frederik Gladhorn2013-03-142-1/+11
| | | | | | | | | | Change-Id: I62e0b3bb4882f58ba58b3c8d71679e4ad2dbc5a3 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
| * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-03-1412-49/+60
| |\ | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qml/debugger/qv8profilerservice/qv8profilerservice.pro Change-Id: I2fd99ed8bd03302b9bbf31e6f21990f6455c4f1c
| * | Compile fix.Samuel Rødal2013-03-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Some compilers don't allow the first argument to printf and similar functions to be a non-literal string. Change-Id: Idd11ae6679d5c0585b5d10b76c991dcfdb4f65da Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| * | Polish usage of a QElapsedTime instance in QSGThreadedRenderLoopJędrzej Nowacki2013-03-131-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | The patch should make valgrind happy, by not using an uninitialized memory. Change-Id: Iec7f16c56f250dd121a37f03da4cfc5d9e5c0742 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| * | Fix usages of \since for QML itemsThomas McGuire2013-03-135-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | \since uses the QML import, not the Qt version. When adding a new property, it needs a REVISION argument and the type needs to be registered again for the new version. Change-Id: I2e636e9d26c8e989729eadad2ef73a836c35caa1 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| * | Documentation and versioning for new Window propertiesShawn Rutledge2013-03-133-3/+126
| | | | | | | | | | | | | | | | | | | | | | | | Even some of the properties that existed in 5.0 were not documented. Change-Id: I25a14b9b19425a6c792d06bc41983e9abd1d17d0 Task-number: QTBUG-29807 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
| * | Abort rendering when QOpenGLContext::create/makeCurrent fails.Gunnar Sletta2013-03-131-5/+13
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-30158 Change-Id: Ic8239fe6f074c989e4474d46042e1a82796b4908 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
| * | don't use CamelCase includesOswald Buddenhagen2013-03-138-26/+28
| | | | | | | | | | | | | | | | | | | | | | | | they are not available during bootstrap. Change-Id: I5e941f22cd2b9fa622730ba0bf8389394f6a30a5 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
| * | Add QtQml.Models moduleAlan Alpert2013-03-1213-236/+528
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The moved Model classes can now be exposed in a QtQml import. To keep the QtQml import resticted to more core functionality, they are being exposed in a plugin module. Change-Id: I0a84642a72c7c9bbf9b6ffd2a6c33549f8e61c29 Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * | Fix remote image loading for AnimatedSpriteAlan Alpert2013-03-123-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | The Sprite generated behind the scenes had no QmlEngine associated, and the engine is needed by QQuickPixmap for async loading. Task-number: QTBUG-28086 Change-Id: Ibf3b03c54b339fe8f44201dc6fcb507e5274bbec Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| * | Fix QString usage in createPixmapDataSync().Friedemann Kleint2013-03-121-2/+2
| | | | | | | | | | | | | | | | | | | | | Warning introduced by 707bbe5dea9d7398b205124a54422f2fafb6f151 . Change-Id: I20f0da00ea519cc2ec82a1d13f1887c099a3947c Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
| * | Disable accessibility temporarily.Frederik Gladhorn2013-03-121-3/+3
| | | | | | | | | | | | | | | | | | | | | This is required to update headers in QtBase. Change-Id: I373a1f13dcde8ce1cafeedb5cd2269a0f8f3a670 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
| * | Fixed incorrect vsync delta time in QSGThreadedRenderLoop.Yoann Lopes2013-03-121-1/+1
| | | | | | | | | | | | | | | Change-Id: I32bb720e9c9aa0278959dd64e5e1c449bdace7d1 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| * | Introduce QML_FBO_FLUSH_BEFORE_DETACH to work around FBO issue.Michael Brasser2013-03-121-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On some AMD hardware, detaching the depth attachment immediately after rendering to an FBO will cause rendering issues. Adding an explicit glFlush before detaching seems to work around the issue. Task-number: QTBUG-29265 Change-Id: I97c7b87c1c3d3a69a4d6228dd9459745710c5f4c Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| * | Use official V8 string manipulation methods in QMLPeter Varga2013-03-123-7/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QtJSBackend's String::GetCharacter and String::Equals methods are Qt specific and they are not supported by official V8. These methods can be replaced by more "V8-friendly" implementations in QtDeclarative. Thus the mentioned methods can be removed from QtJSBackend to reduce the difference between QtJSBackend and the official V8 source. Change-Id: I5590ca62dc667e64a7f54a7e47a02d350ba0c077 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * | correct misspellingShawn Rutledge2013-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | | Canceled Change-Id: Ie080e5be4af0cf60cab56e906f82fb6e7b32c6e3 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * | Create the sg render thread's opengl context on the GUI threadGunnar Sletta2013-03-121-34/+12
| | | | | | | | | | | | | | | Change-Id: I710d80ebb4e5a12fda1f58f54089b0e72268dfcf Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
| * | Support activeFocusOnTab in QQuickItemLiang Qi2013-03-123-2/+166
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add activeFocusOnTab as property to QQuickItem. Setting the property allows automatic keyboard navigation between all elements that have it set. This key event handler will only be called after the QML key handlers, such as KeyNavigation and Keys, and the C++ key event handlers, such as keyPressEvent function. Algorithm is most done by Frederik Gladhorn, in cooperation with Gabriel de Dietrich. Done-with: Frederik Gladhorn <frederik.gladhorn@digia.com> Done-with: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Change-Id: I8b58be9c20d113661fe85d27bdb1af84340d9de5 Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| * | Fix displacement transition bug for horizontal caseGuenter Schwann2013-03-111-1/+1
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-29944 Change-Id: I23381f7a1d2c8d3c6df007b5b11c12b0db3bb1e9 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| * | Replace deprecated V8 functionsPeter Varga2013-03-116-61/+61
| | | | | | | | | | | | | | | | | | | | | | | | The External::Wrap and External::Unwrap functions became deprecated in the mainline V8. Replace them as it is officially proposed. Change-Id: Ieac1da53997da440a909939d86c98f17a124c068 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * | Remove comment about performance in qquickitem's clip property.Gunnar Sletta2013-03-111-4/+0
| | | | | | | | | | | | | | | Change-Id: I2d1b9a86251466445d506969d779308e2d7b92bb Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
| * | Fix MSVC warning C4819 under Chinese localeDebao Zhang2013-03-111-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | warning C4819: The file contains a character that cannot be represented in the current code page (936) Change-Id: I53dc345e03b0ec6f951bd2763bc1bab4aef63d04 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * | Handle focus events directly in TextEdit.Frederik Gladhorn2013-03-073-29/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of relying on the item change where we don't get focus reason, use focusInEvent and focusOutEvent. Change-Id: I2db7d81c67c65595b929fdcedc568af360831c5c Reviewed-by: Caroline Chao <caroline.chao@digia.com>
| * | TextInput: Update text deselection on focus out eventCaroline Chao2013-03-071-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The text selection should not be cleared when the focus out event received has one the following reasons: - Qt::ActiveWindowFocusReason - Qt::PopupFocusReason When the user opens a menu or navigates to another window, the eventual selection should not be clearer. This also makes the behavior consistent with TextEdit. Change-Id: Ibc6242cb2f8207cf5281925c8e20b88394f21eea Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| * | TextInput: Handle focus event directlyCaroline Chao2013-03-073-27/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | Use focusInEvent and focusOutEvent instead of changeItem to handle focus event. (One benefit is the focus events have the focus reason and changeItem doesn't). Change-Id: I164820f375f0ffddc529d59565a3e448b84c6042 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| * | Focus reasonCaroline Chao2013-03-075-24/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When trying to do for example text handling it becomes obvious that focus handling is not proper. A mouse click focus should de-select text, while a window change should preserve the selection. Re-introduce focus reason. Change-Id: I3322c976437cba68938d7c9188e549bdb499fa5a Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| * | Fix rendering of subpixel positioned native textEskil Abrahamsen Blomfeldt2013-03-073-3/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To get accurate sampling of the native text rendering, we use nearest filtering. This, however, does not work well when we're sampling in the middle of pixels and the result is that with text which is positioned at 0.5 offsets, we will sample the wrong pixels and get artifacts from this. The main use case for native rendered text is unrotated and unscaled text, so we fix this use case by pixel-aligning the translation factor. Done-with: Samuel Task-number: QTBUG-30022 Change-Id: I6911196d6ff491dca3b329c42da1c6dd7263cff0 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| * | Remove spurious includeAlan Alpert2013-03-051-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | While it's discouraged to use the entire module headers inside Qt, this particular example also compiles without the line. Change-Id: I75b6fc09e11d00df2f19f5db9b0209ed4cd82844 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>