aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* define MODULE_VERSIONOswald Buddenhagen2013-02-271-0/+2
| | | | | | Task-number: QTBUG-29838 Change-Id: I03ce9975ede5cff53e976409e2fabff1f56e1ea9 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Merge branch 'stable' into releaseJohanna Aijala2013-02-212236-2800/+10167
|\ | | | | | | Change-Id: I13e80072db1e2c14a37b6a123276be81b085e87e
| * Add Test for Animating Qml Dynamic Properties using QPropertyAnimationDavid E. Narváez2013-02-214-0/+166
| | | | | | | | | | | | | | | | | | | | Test case for calling QQmlVMEMetaObject::metaCall from QPropertyAnimationPrivate::updateProperty Task-number: QTBUG-29082 Change-Id: Iecab74132eb3a843e53356effe3b6bbe4d5a8fb2 Reviewed-by: Alan Alpert <aalpert@rim.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
| * Doc: Fix paths and add missing project files for QML and Quick examplesTopi Reinio2013-02-209-6/+102
| | | | | | | | | | | | | | | | | | | | This change fixes a number of 'example path does not exist' warnings from qdoc, and adds .qmlproject files for pure qml examples so they'll appear correctly in the example manifest files. Change-Id: Id0a424c4826fb5d8ebe6c3309bf33b976ff8477c Reviewed-by: Geir Vattekar <geir.vattekar@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Fix QQuickTimeLine::accel() & accelDistance()J-P Nurmi2013-02-201-3/+4
| | | | | | | | | | | | | | | | | | | | Do not compare real numbers (velocities, accelerations and distances) to 0.0f, but use qFuzzyIsNull() and qIsNaN(). Task-number: QTBUG-29144 Change-Id: I8fe7ebfbc9f665fa2507e66344d081ef2f43b181 Reviewed-by: Alan Alpert <aalpert@rim.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| * Fixed build when Qt is configured with -no-opengl.Samuel Rødal2013-02-204-15/+11
| | | | | | | | | | | | Task-number: QTBUG-28849 Change-Id: I331ebca76892ce7ffbc6f8e03ff4afe0c8e28d5e Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| * Docs: Slow Down Animations only exists in qml1Frederik Gladhorn2013-02-191-8/+0
| | | | | | | | | | | | | | The functionality was part of qmlviewer. Change-Id: Iaf2e19acf54e6773e2b79659f4dc51b92de91dd4 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Clarify Component::createObject docsAlan Alpert2013-02-191-2/+2
| | | | | | | | | | | | Task-number: QTBUG-29650 Change-Id: Ie6f9027ff779f8a513a52b425d9a393c0ecd9c7d Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Fix embedding images in text elementsEskil Abrahamsen Blomfeldt2013-02-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | It seems that the the inner target rect has either been added recently or its default has been changed to something invalid, because we need to set it to the same as targetRect for the image to show up at all. Task-number: QTBUG-29560 Change-Id: I0fe6b7c5ab07afc780b8ea33a7ccc210861e0821 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| * Doc: Update QtQuickTest documentationCaroline Chao2013-02-181-0/+28
| | | | | | | | | | | | | | | | | | | | Add some information about -input, -functions and -help command-line options. Add some examples on how to run a single file and a single function for a QtQuickTest based test. Change-Id: Icd5f92bf8541aa412e2cd18d82dec16a85fe78c9 Reviewed-by: Alan Alpert <aalpert@rim.com>
| * Doc: Correcting typo "without with"Marcel Krems2013-02-181-1/+1
| | | | | | | | | | Change-Id: Ibacbb9aefe9a333994014aec17a0079477a4618f Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Fix missing TextInput::remove(int start, int end) docsJ-P Nurmi2013-02-151-1/+1
| | | | | | | | | | Change-Id: I0c98e713d53391a191435e5c17b58becddf6d451 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * Doc: Removed reference to deprecated \badcode command.Jerome Pasion2013-02-153-7/+11
| | | | | | | | | | | | | | | | | | QDoc doesn't differentiate between \badcode and \code. They both look the same in the output. Change-Id: Ia0580f7d664ad5e33b48d6511dac7c61349cacce Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Add license files mandated by (L)GPL.Timo Jyrinki2013-02-154-0/+1660
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently only qtbase includes the required LICENSE files, which are referred to from the code headers. The same files should be distributed as part of all the modules as well, so that the (L)GPL licenses are adhered. These files were wget:d from: https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LGPL_EXCEPTION.txt https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.LGPL https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.GPL As an addition to above, added also LICENSE.FDL. All the modules additionally require it, since they include at least *.qdoc files and in some cases a couple of others. File received via wget http://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.FDL Change-Id: I35cb3523061cfb041084fe9a7e60928c44e224b2 Reviewed-by: Jason McDonald <macadder1@gmail.com>
| * A MouseArea should not receive move or release events if the press was not ↵Michael Brasser2013-02-143-1/+39
| | | | | | | | | | | | | | accepted. Change-Id: If70650d7150b224f4460697a953611dd37d57af1 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| * Remove QPointerBase bic check.Stephen Kelly2013-02-131-5/+0
| | | | | | | | | | | | | | QPointerBase is not public or exported and it is to be removed Change-Id: Ieb7360a1a01125d4bff20140b02ec71a076440cb Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * DesignerSupport: Fix rendering in designer for if new items are addedMarco Bubke2013-02-121-0/+1
| | | | | | | | | | | | | | | | | | The SG nodes are exchanged if the hierarchy the Qml hierarchy is changed. So the SG root node should be always updated for every rendering. Task-number: QTCREATORBUG-8699 Change-Id: I069142e4c5fc65efc3485017fa000ed7e8f2b350 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
| * Remove use of QPainter::HighQualityAntialiasing. It has no effect.Gunnar Sletta2013-02-122-4/+3
| | | | | | | | | | Change-Id: I7e1d07a9f34d6edf9dbe3449d34636f700218532 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
| * Fix extending example.Gunnar Sletta2013-02-128-15/+14
| | | | | | | | | | | | | | | | The antialiasing was broken due to wrong flag being used and that the bounds were outside the texture and chapter 5 and 6 did not compile. Change-Id: Ib7c4d8c276a3cc5583ff794e10ff539720857e0c Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
| * Doc: corrected reference to snippet in imageparticle.qdocNico Vertriest2013-02-080-0/+0
| | | | | | | | | | | | Task-number: QTBUG-29101 Change-Id: If731480343fd4d65aa5fca5c184b03c14f2f340e Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Doc: Removed reference to QAbstractItemModel::setRoleNames()Venugopal Shivashankar2013-02-081-17/+25
| | | | | | | | | | | | | | | | | | This function is deprecated and it is recommended to reimplement QAbstractItemModel::roleNames() instead. Task-number: QTBUG-29456 Change-Id: Ib28759fe2349edd32a1b87bac04eb44d625d3e60 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Stabilize resizemodeitem test.Frederik Gladhorn2013-02-071-2/+1
| | | | | | | | | | | | | | | | | | | | Resizing can take time. Instead of qWait(50) use QTRY_COMPARE to make sure we give enough time. Change-Id: I484eca1f4d49381913dc82f405c73de653608493 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: David Faure (KDE) <faure@kde.org> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| * Fixed Canvas ImageData pixel values not being settable to 0.Samuel Rødal2013-02-072-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | Someone probably figured "since the data is all initialized to 0 to begin with, we can skip 0 values". However, it's possible to temporarily set a value to other than 0 and then back to 0, a fully valid use case that we need to support. Task-number: QTBUG-29065 Change-Id: Ia9f0803743d696ca8b9cca89c666ccba80a3abd0 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| * substitute fixed version numbers in qdocconf files with variablesOswald Buddenhagen2013-02-062-12/+12
| | | | | | | | | | Change-Id: If28446d2d14dde62ff662ffdd366dc6384c95326 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Fix lupdate-warning in qqmlrewrite.cpp.Friedemann Kleint2013-02-061-4/+12
| | | | | | | | | | | | | | | | | | Class 'QQmlRewrite' lacks Q_OBJECT macro. Replace global-static strings by message functions. Change-Id: I67a6fbe67575533d3ce5750d72c9d7eff06e7efa Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
| * Fix lupdate-warnings in qqmlimport.cpp.Friedemann Kleint2013-02-061-13/+9
| | | | | | | | | | | | | | | | | | | | qqmlimport.cpp:738: Class 'QQmlImportsPrivate' lacks Q_OBJECT Remove tr()-function and use QQmlImportDatabase::tr() directly. Change-Id: I3a1561c57a6ee90d271a6043b0175e17a7828666 Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
| * Fix lupdate-warnings.Friedemann Kleint2013-02-063-3/+3
| | | | | | | | | | | | | | | | | | qqmlcomponent.cpp:667: Cannot invoke tr() like this qqmltypeloader.cpp:2292: Cannot invoke tr() like this qquickloader.cpp:944: Cannot invoke tr() like this Change-Id: Ifdd1a7b958b6af88f251e7df27eb4d4018301914 Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
| * Add next.png to shared qrc filesAlan Alpert2013-02-062-0/+2
| | | | | | | | | | | | | | | | | | | | Otherwise the executable versions of the examples print errors instead of loading it. Change-Id: I7d370ce3ee172491c004668847cdb6d5967f2b24 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
| * Ensure the cursorRectangle is updated as the width of the text changes.Andrew den Exter2013-02-012-1/+11
| | | | | | | | | | | | | | | | | | | | Outside of when of a monospace font is used, if the text changes the visual position of the cursor will have most likely changed as well even when the cursor index hasn't. Task-number: QTBUG-28677 Change-Id: If8077772d8541a677d5875976e6cd9fc453731df Reviewed-by: Alan Alpert <aalpert@rim.com>
| * Merge branch 'release' into stableSergio Ahumada2013-01-3113-18/+36
| |\ | |/ |/| | | Change-Id: Ic270f7814489b2c7df7e0f1ecb46cd516802cac5
* | Doc: declarative-colors.png not visible in qmltypereference.qdocv5.0.1Nico Vertriest2013-01-281-0/+0
| | | | | | | | | | | | | | | | Copied the file from qml image dir to quick image dir Task-number: QTBUG-29101 Change-Id: Iae64763bc38e135a0dbff8566cf540a309e4c42f Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Doc: corrected path to snippetNico Vertriest2013-01-281-1/+1
| | | | | | | | | | | | | | | | Added "quick" to path in imageparticle.qdoc Task-number: QTBUG-29101 Change-Id: If328cde08f46b720defa1953916753ba9d9836a8 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | fix qmltest example install pathOswald Buddenhagen2013-01-281-2/+2
| | | | | | | | | | Change-Id: I267155bb34b8226331fc2951521dc7b8643a014c Reviewed-by: Alan Alpert <aalpert@rim.com>
* | mark forgotten EXAMPLE_FILESOswald Buddenhagen2013-01-282-0/+6
| | | | | | | | | | Change-Id: I83c7706479ea3afd45ab9c97f63f68d416b28f55 Reviewed-by: Alan Alpert <aalpert@rim.com>
* | fix installation of qmltestcase exampleOswald Buddenhagen2013-01-281-3/+18
| | | | | | | | | | | | | | | | | | | | | | split the project along the built-as-part-of-qt line: in qt, it must comply with the installation rules for examples, and it shouldn't be an actual test case - our CI is not supposed to run it ... the stand-alone build (which users are supposed to make use of) needed adding TESTDATA for proper installation. Change-Id: I1bbf7b1204410c5eb8755477310bb023e8f87623 Reviewed-by: Alan Alpert <aalpert@rim.com>
* | Doc: Add QML Types to table of contents in AssistantTopi Reinio2013-01-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Replace 'headerfile' with 'qmlclass' in qdocconf file. As a positive side-effect, QDoc will also add files for 'All members' for QML Types into .qhp as well. Task-number: QTBUG-29226 Change-Id: I282ef42283ec147ea0f2b466b15e7f104c8a012a Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* | Doc: Updated change log with documentation entryJerome Pasion2013-01-241-0/+1
| | | | | | | | | | Change-Id: I1cd4dc70265f2425045328910be12a0cfaeb795c Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Remove outdated macro usageChristian Stenger2013-01-246-11/+7
| | | | | | | | | | | | Change-Id: I4b58f3d74d7dec9a95a07b907c500990630e7762 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Doc: Fixed "QML Types" node in AssistantJerome Pasion2013-01-221-1/+1
| | | | | | | | | | | | | | | | | | | | Removed "class" from the "selectors" variable in qdocconf file. Task-number: QTBUG-29242 Change-Id: I960dcbdb22358e033177b0ccb9c211136c0e4dcb Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
| * Document QQuickItem::itemChange and QQuickItem::window() properlyGunnar Sletta2013-01-311-3/+87
| | | | | | | | | | Change-Id: Ic0e50ae8760c0c3050db3a095b0fa86679a0c010 Reviewed-by: Alan Alpert <aalpert@rim.com>
| * Strengthen reference to var properties during constructionAlan Alpert2013-01-291-0/+6
| | | | | | | | | | | | | | | | | | | | | | Normally var properties are kept alive by a reference to the object they are declared on, but during the construction of that object the GC may not be aware of said object. This change uses a strong reference during GC passes which take place while the object is being constructed. Task-number: QTBUG-29138 Change-Id: Ieecfcc7567aefac0d67cb933728daf16ed3eed0a Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
| * docfix: Emitter.enabled was documented as Emitter.emitting.Gunnar Sletta2013-01-291-1/+1
| | | | | | | | | | Change-Id: I9500c336b9e11f858da95ff4ed783b70876f3fd6 Reviewed-by: Alan Alpert <aalpert@rim.com>
| * Fix memory leakAlan Alpert2013-01-291-0/+1
| | | | | | | | | | | | | | | | | | The cache is filled with dynamically created entries, so clear is not quite enough. Change-Id: I40a49ce5d1a3d6da1b419e85cae95f2f95011a19 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
| * Fix unterminated commentSze Howe Koh2013-01-281-1/+1
| | | | | | | | | | | | Change-Id: Ic5bcbac339588fdded265a00515f768058d73870 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Doc: Fix "Command '\li' outside of '\list' and '\table'"Sze Howe Koh2013-01-281-1/+1
| | | | | | | | | | | | | | | | It doesn't look like any list is meant to be here. All other instances of "down" are italicized in this document, so we follow suit. Change-Id: I2f0c55dba2025b4eef81248a5f650ebaaaa5bb3a Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Introduce a workaround for a GLSL bug on BB10Fabian Bumberger2013-01-261-0/+4
| | | | | | | | | | | | | | | | When using the sizeTable property of the QQuickImageParticles, the vertex shader is not compiling. This is a workaround for a compiler bug on BB10. Change-Id: I32d5e92bc300304cb856d97b1310f607df1e48be Reviewed-by: Alan Alpert <aalpert@rim.com>
| * Prevent possible leak with texture providers.Michael Brasser2013-01-251-0/+2
| | | | | | | | | | | | | | | | If the job has been cancelled, ensure we clean up the texture factory that was created. Change-Id: I0a6e4a23732e6041084ddc483d701a25befd91c9 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| * Ungrab mouse when FocusAboutToChange instead of LeaveFrederik Gladhorn2013-01-245-20/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 7b2e2117162594a2d0234bb02408f5b5a446488b introduced a regression in mouse handling: When moving the mouse out of the window it would cancel all further mouse events. That is actually not wanted (eg scroll bars). Instead ungrab the mouse when the focus changes, that means the mouse handling with popups works and the scrollbar use case is also fixed. All the tests related to this seem quite timing sensitive, so try some more QTRY_VERIFY. Remove the parallel_test so that more cpu time will actually let the tests pass more reliably. Change-Id: I90586b05f461d3762728a466d71bcb967e03d14b Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * Doc: Fix uses of \sinceDebao Zhang2013-01-242-3/+2
| | | | | | | | | | | | Change-Id: Idf497424279fbee08e6e5750e6a15372c808105f Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-13 20:07:23 +0000