aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Move QtQuick validators out of qquicktextinput_p.hJ-P Nurmi2015-03-188-231/+317
| | | | | | | | | TextField (v2) inherits QQuickTextInput, and therefore has to include qquicktextinput_p.h. Move the internal Q_AUTOTEST_EXPORT'd classes out of the header to avoid build problems on Windows due to missing symbols Change-Id: I6f37cf4e112425ff6c4c0a4ccc5e584f26599d8a Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Restore depth buffer usage when last render node is removedMikko Harju2015-03-181-0/+3
| | | | | | | | | Adding a QSGRenderNode to the scene permanently disabled opaque batches by disabling depth buffer usage. Reset the depth buffer usage to the default value once last QSGRenderNode has been removed from the scene. Change-Id: I760afde83ae9eaaf1b5571c37fd0081eb23b1f20 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* Text: add support for paddingJ-P Nurmi2015-03-176-37/+478
| | | | | | | | | [ChangeLog][QtQuick][Text] Added padding, leftPadding, topPadding, rightPadding and bottomPadding properties. Task-number: QTBUG-41559 Change-Id: I5aa3a9eaad86de5e49d8e2da2a9f583e9a17222b Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Fix use of qml versioning in qmlAlan Alpert2015-03-171-2/+2
| | | | | | | | The bumping of a version number shouldn't "unpublish" any types. Change-Id: I01ceb70442cb6643478f75bb5729f3db7c989bfa Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
* Update Ecmascript testsuite submoduleSimon Hausmann2015-03-172-1/+1
| | | | | | | Changed the url and sha1 to the new repository that lives next to qtdeclarative Change-Id: I39dd50490c635e1a2858afc913cfcbbf10302fa1 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* Tests: initialize pointer class member field.Erik Verbruggen2015-03-171-0/+4
| | | | | | | 'cause valgrind complained. Change-Id: I9f18b3c8adaab8a893b8f6d685b19b2d042ccef7 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.5' into devSimon Hausmann2015-03-1763-809/+43627
|\ | | | | | | Change-Id: I6033aba359ac551f450ad517d20a0986bf4655f6
| * Fix warningAleix Pol2015-03-161-1/+1
| | | | | | | | | | | | | | | | If the arguments of console.timeEnd are wrong, say it's timeEnd instead of time. Change-Id: Ida8a76cd452cf3aecc03e5064bbf213333d93a03 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Fix usage of QtQmlDevTools private headers on OSX with framework buildsSimon Hausmann2015-03-1616-22/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously this module borrowed its private headers from QtQml, so that when writing QT += qmldevtools-private, you'd get the private headers from QtQml. This doesn't work when QtQml is built as a framework. A cleaner solution is to give this module its headers proper by letting syncqt create the forwarding headers correctly (and consequently also include them in make install). In order for this to work, the included headers themselves cannot include any headers from QtQml, which this patch also takes care of, through a centralized inclusion of qv4global_p.h. Change-Id: I9bb8337956a2774cfaca6b338369face6c6ee785 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
| * Remove QQmlDirParser from QtQmlDevToolsSimon Hausmann2015-03-165-30/+4
| | | | | | | | | | | | | | | | This class is not needed in the library. Change-Id: Ie880086a849b62a2856d1f388a64d363b040cb56 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * PathView: use qt.quick.itemview.lifecycle logging categoryShawn Rutledge2015-03-131-3/+17
| | | | | | | | | | | | | | | | It is the same for debugging delegate cycling in ListView. Task-number: QTBUG-42716 Change-Id: I54b83a25a5d8473c643cd326fe114317103bb24e Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * Acknowledge QPersistentModelIndex is a built-in meta-typeGabriel de Dietrich2015-03-121-30/+3
| | | | | | | | | | | | | | | | | | | | We remove the now unnecessary meta-type registration and conversions for QPersistenModelIndex. This reverts and amends commit 7b29a983fa794291ff8ec. Change-Id: I4e8346bb7ab03766e1dd5c2c23bb6cf47ab1f455 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
| * Remove bogus autotests for invalid portsKai Koehne2015-03-121-68/+0
| | | | | | | | | | | | | | | | | | | | | | Qt itself doesn't prevent opening a socket in the reserved port range. So what these tests actually check is the system configuration, not Qt. Task-number: QTBUG-44952 Change-Id: Iee6d6d1a5a7a0f4d2039300ccbbbe8bf55a519b9 Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Fix qqmldebuggingenabler autotestKai Koehne2015-03-121-1/+1
| | | | | | | | | | | | | | | | | | The test calls itself as a qml debug server. This requires the debugging functionality to be enabled. Task-number: QTBUG-44952 Change-Id: I462d035ff7ed722008f3710c6db90e5640546be2 Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
| * Handle context loss in the threaded render loopLaszlo Agocs2015-03-123-0/+21
| | | | | | | | | | Change-Id: I3f9219dd2fed15094c2f7d670a981406e601959b Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
| * tst_QQuickPathView::mouseDrag(): Skip on Windows if drag fails to start.v5.5.0-alpha1Friedemann Kleint2015-03-111-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | The test can be thrown off by external mouse move events which influence the calculation of the drag distances. It is not clear where they originate from on the CI. FAIL! : tst_QQuickPathView::mouseDrag() 'pathview->isMoving()' returned FALSE. () tst_qquickpathview.cpp(1506) : failure location Change-Id: I398304b5597579033df81e1d0d32b2a3ab5516d6 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
| * Don't evaluate the expression in switch() multiple timesLars Knoll2015-03-112-3/+28
| | | | | | | | | | | | | | | | | | | | | | | | The old code would evaluate the expression in the switch statement once for every case label. This is not only slower than it should be, but can also lead to unexpected results in case the expression doesn't always evaluate to the same value or has side effects. Task-number: QTBUG-41630 Change-Id: Id93baca7e3aa09ce884967ef6524d4c4f055bcd6 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Fix flickable stealing gestures when height >= contentHeight.Andrew den Exter2015-03-112-4/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Or width >= contentWidth. If newY is equal to both maxY and minY then the second assignment to rejectY can clobber the first. Changing the second assignment to an |= means rejectY is true if either is true. Secondly maxY became positive when height was greater than contentHeight instead of having a maximum of 0, which ensured rejectY evaluated to false in the case newY <= maxY and the mouse was stolen. Change-Id: I6416d0e23c3ef898887a7b3e3fcdc1dc12853548 Reviewed-by: Martin Jones <martin.jones@qinetic.com.au>
| * qt quick particles: Fix const correctness in old style castsThiago Macieira2015-03-101-5/+5
| | | | | | | | | | | | | | Found with GCC's -Wcast-qual. Change-Id: Ia0aac2f09e9245339951ffff13c958e1d7c929c0 Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
| * Fix clang warningAndrew Knight2015-03-101-0/+4
| | | | | | | | | | | | | | | | | | Removes "warning: first declaration of static data member specialization of 'static_vtbl' outside namespace 'QV4' is a C++11 extension" by placing the declarations inside the QV4 namespace. Change-Id: I9a31874430900a200e83c42ff6c1afc36f0431e1 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * QML Engine: ArrayBuffer XHR response type supportValery Kotov2015-03-098-0/+144
| | | | | | | | | | | | | | | | | | | | | | Support for "arraybuffer" response type for QQmlXMLHttpRequest was added. [ChangeLog][QtQml][QQmlXMLHttpRequest] QQmlXMLHttpRequest now supports "arraybuffer" binary response type. Change-Id: I866e543cc7bc6ab037ffff1ef6628057b73daf90 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * testlib: Fix qml objects not deleted between data testsCaroline Chao2015-03-092-3/+24
| | | | | | | | | | | | | | | | | | | | | | | | Call wait(0) after the cleanup() function and not only at the end of the test run (wait(0) is used to call processEvents()). Otherwise, eventual destroy() calls in test function are not executed between data tests. Task-number: QTBUG-30523 Task-number: QTBUG-42185 Change-Id: I1d588ee28c61cda835e25307bc1c565d68b741fe Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
| * Doc: Removed the release notes for Qt Quick and Qt QmlVenugopal Shivashankar2015-03-093-586/+2
| | | | | | | | | | | | | | | | | | | | | | | | These pages were not maintained and were duplicating info. provided in the what's new page provided for each release. Change-Id: I2ee4010de22ef3fb394e3bcdb6adb15db59a2cc9 Task-number: QTBUG-43235 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Sami Makkonen <sami.makkonen@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * Re-enable readback test in tst_qquickwidgetLaszlo Agocs2015-03-091-4/+0
| | | | | | | | | | | | | | | | This seems to work now. Task-number: QTBUG-39917 Change-Id: I01bbc9b7ddfbb003265479eaa2282e39eebf35c5 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
| * Add missing flush for multisampled QQuickWidgetLaszlo Agocs2015-03-091-1/+2
| | | | | | | | | | | | | | | | | | Otherwise we might be using a half-ready texture when performing compositing. The issue was very visible on OS X at least. Task-number: QTBUG-39917 Change-Id: I71326cb99567f458a6ca7a2cad322a315ee6674f Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
| * Reduce number of allocations when constructing text nodesEskil Abrahamsen Blomfeldt2015-03-092-36/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In cases where you have a huge number of text elements that can be merged, we would do a lot of reallocations (one per node that would be merged into another). As the number of merges grew, this seemed to converge at about 50% of the time spent in updatePaintNode() in the text classes. We can almost eliminate this cost by only doing one realloc per node that will actually end up in the scene graph. This patch does a first pass where it simply bundles together nodes that can be merged. Then it does a second pass where it actually merges the nodes. In this second pass it can easily precount the required size of the arrays and we can limit it to a single realloc. Task-number: QTBUG-37365 Change-Id: I4e44c01cd83df39304cbbce34f3b8f773763e091 Reviewed-by: Michael Brasser <michael.brasser@live.com>
| * Implement cache property for QQuickAnimatedImageDaiwei Li2015-03-064-2/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some longer and larger .gifs can consume a lot of memory if every decoded frame is cached. Just as the backing QMovie provides the ability to not cache frame, so should AnimatedImage. This also allows a workaround for some animated image types that can contain loops that aren't handled correctly (QTBUG-24869) to not leak memory. Change-Id: I0639461d75bb2c758917893e7a6ae5c215fffa9d Task-number: QTBUG-44447 Task-number: QTBUG-24869 Task-number: QTBUG-28844 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
| * Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5Frederik Gladhorn2015-03-068-8/+43066
| |\
| | * Merge remote-tracking branch 'origin/5.4' into 5.5Frederik Gladhorn2015-03-038-8/+43066
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/qml/jsruntime/qv4numberobject.cpp Change-Id: I4e66a03ef4d99cec192c9da30c028fd8c1f4ac0d
| | | * V4: fix ToFixed rounding for 0 fraction digits.Erik Verbruggen2015-03-032-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (12.5).toFixed() should return 13, not 12. Task-number: QTBUG-43885 Task-number: QTBUG-44039 Change-Id: Id2b19641e8c12dd5755d8447508b74567e4a2b9b Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| | | * bic: Add 5.{3,4}.0 bic data for QtQuickWidgetsSergio Ahumada2015-03-023-3/+43036
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this is a new module since Qt 5.3 Change-Id: I9d33ba8f046190f649643302ddc343cbe6e649ed Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
| | | * Fix crash in overdraw and change visualizersDaiwei Li2015-02-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It appears to be possible for node->element()->batch to be NULL Task-number: QTBUG-43129 Change-Id: If6e4e265a02ee305bf3aa9cad387b7a73648367a Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
| | | * Fix memory leak of QSGContext object in QSGThreadedRenderLoopjian liang2015-02-242-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add destructor for QSGThreadedRenderLoop to destory QSGContext object. Change-Id: I479947eb35a5d7888d45655a9b8e2ece5e30bc33 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
| * | | QV4::Primitive: Help clang disambiguate symbolsGabriel de Dietrich2015-03-061-0/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie20e6081b80e8f177991ac8aafda054c11b1620c Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | | Don't limit to files ending with .qmlKevin Ottens2015-03-161-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Especially useful when the program is invoked indirectly by a shell running the QML file like an executable. Such script executable often don't have an extension to make their invocation look like that of binary executables. [ChangeLog][QtQml] Make it possible to make script without .qml suffix Change-Id: I5a569bdea185cfa60ce68afa27ae03278b1acdb8 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | | | Export QQuickImage, we need it in QtGraphicalEffects.Gunnar Sletta2015-03-101-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I91bf90b41cdcab4beb7dbf6bf770bd251561a258 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* | | | Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/devGabriel de Dietrich2015-03-0623-73/+109
|\ \ \ \
| * | | | Merge remote-tracking branch 'origin/5.5' into devGabriel de Dietrich2015-03-0623-73/+109
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/quick/items/qquicktextedit.cpp Change-Id: I354093ceb996aae40254f2143dec2bb74cf5eb17
| | * | | Fix build: QString needs to be fully-defined for QString()Thiago Macieira2015-03-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qqmldebug.h:46:71: error: invalid use of incomplete type ‘class QString’ qglobal.h:651:7: error: forward declaration of ‘class QString’ Change-Id: I1a800c709d3543699131ffff13c3797acbc19956 Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
| | * | | tst_qqmlitemmodels: Remove pointless QVariant::type() checksGabriel de Dietrich2015-03-051-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If817b30aad08fa32697feab7ba4035d66309ed10 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
| | * | | TextEdit: Block's update should update paint nodeRuslan Nigmatullin2015-03-051-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QQuickTextEdit::invalidateBlock method marks nodes as dirty but doesn't call QQuickItem::update(). Because of that it's impossible to rehighlight text by QSyntaxHighlighter. Task-number: QTBUG-44765 Change-Id: Ibfd973430cf00927dbec027d129c6d722634575e Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| | * | | WinRT: Set alignment boundary to page sizeMaurice Kalinowski2015-03-051-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a hard requirement from the QQmlEngine internals since 5.5 and otherwise causes crashes inside the engine. Change-Id: Id25f465576a0095f5b34da469abe761d3f3bd866 Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
| | * | | Doc: Changed title GridView exampleNico Vertriest2015-03-051-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed title to avoid conflict between GridView QML type and example Task-number: QTBUG-44640 Change-Id: I59c83489e4029c1586ec462f6643fff0ef80155d Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| | * | | Work around QPersistentModelIndex being a built-in meta-typeGabriel de Dietrich2015-03-051-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a temporary work-around and will be removed once I63d733d1eb66aa61691e7afce27fe7372a83ac00 is merged in qtbase. Change-Id: I6cfcf1ddc2c9d408c26c171be865d40141de7fa0 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
| | * | | Fix invocations of static methods of QGuiApplication/QCoreApplication.Friedemann Kleint2015-03-0518-58/+59
| | |/ / | | | | | | | | | | | | | | | | Change-Id: I7bcc209b0c6e77cf6d974af85a19487345a48975 Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
* | | | qml tool: don't process the command nameKevin Ottens2015-03-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The first argument is the command name. There's no need to compare it against possible arguments. Change-Id: I776f10b6872286f89f07582b81d4990260ef9ddc Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | | | TextEdit: add support for paddingJ-P Nurmi2015-03-055-9/+327
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it possible for TextArea to inherit TextEdit, reserve space for the decoration, and set the desired property defaults without having to create dozens of property aliases. [ChangeLog][QtQuick][TextEdit] Added padding, leftPadding, topPadding, rightPadding and bottomPadding properties. Task-number: QTBUG-41559 Change-Id: I4fa22f86e6151524a63b2b862f17bc9d6a713142 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | | | TextInput: add support for paddingJ-P Nurmi2015-03-056-21/+373
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it possible for TextField to inherit TextInput, reserve space for the decoration, and set the desired property defaults without having to create dozens of property aliases. [ChangeLog][QtQuick][TextInput] Added padding, leftPadding, topPadding, rightPadding and bottomPadding properties. Task-number: QTBUG-41559 Change-Id: Iaa7697a10a6f66685c7cae454edf4c1984d411bc Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | | Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/devFrederik Gladhorn2015-03-03116-47540/+146384
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.5' into devFrederik Gladhorn2015-03-03116-47540/+146384
| |\| | | | | | | | | | | | | | Change-Id: I94f8ae93d76bd5c120de25d9c238701afe8bfbd0
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-21 01:42:40 +0000