summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | Smooth dragging an item with MouseArea.Andrew den Exter2013-03-192-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calculate drag distance relative to the mouse position when a drag is detected rather than the press position so there isn't a large change in position on the first move. Task-number: QTBUG-30188 Change-Id: I46918a7b3c62bdaef567b6a9fed651ce33434247 Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
| | * | Fix jump and property changes on first move when dragging a Flickable.Andrew den Exter2013-03-193-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a regression whereby on the first mouse move the contentItem was moved the total distance from the touch point to where the drag distance was exceeded. For large drag thresholds this causes a noticeable jump. Task-number: QTBUG-30032 Change-Id: I92c119d27dc2e22203484f9ada5978697d171957 Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
| | * | Merge branch 'release' into stableOswald Buddenhagen2013-03-181-0/+2
| | |\| | | | | | | | | | | | | Change-Id: I789c049c5cb8dbf654f993cd501b17bb80304f87
| | | * define MODULE_VERSIONOswald Buddenhagen2013-02-271-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-29838 Change-Id: I0dd628cdf63c13a8ac94213f2fc1b7d04df24786 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | | * Merge branch 'stable' into releaseJohanna Aijala2013-02-211441-20104/+20752
| | | |\ | | | | | | | | | | | | | | | Change-Id: Ib992a6e988e06887f7a4b3bc581514aa6a5b8886
* | | | | Backport some enum optimizations from Qt 5Alan Alpert2013-03-261-11/+33
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Saving the int when we check the enum is valid allows us to make it a literal assignment instead of a binding, which is much faster on object creation. Change-Id: Ieb174289438a17574c4716df372b04d4dee6d0da Reviewed-by: Christopher Adams <chris.adams@jollamobile.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | | | Fix warning about extended date/time range in Qt 5.Friedemann Kleint2013-03-152-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store the qint64 julian day in 2 ints, allowing Qt Quick1 applications to work until approx 2.5 Quadrillion AD. Task-number: QTBUG-28119 Change-Id: Id9cbcd8f01fb15e3eef13609e96d107b48b3ad9b Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-03-1413-62/+628
|\| | | | | | | | | | | | | | | Change-Id: I39178ea637dc950cbbb631b725350ab99897ad45
| * | | Makes QSmoothedAnimation respect zero duration.Thomas Kristensen2013-03-133-2/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In automated GUI test scenarios it often desired not to wait for animations before verifying a result, so setting the duration to zero should accomplish this, before this patch; if duration was set to zero QSmoothedAnimation would treat it as if duration was not set, and used velocity to calculate animation speed. Change-Id: Ie6520d6c595bd014f3cab69bbb527e773f3850da Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name>
| * | | Fix warning about adding int to a QString (CLANG).Friedemann Kleint2013-03-111-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: If83018b1bd6dcaf7f8104fa9c4c3f4359062623e Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| * | | Fix warnings about unused variables in tests (CLANG).Friedemann Kleint2013-03-114-28/+23
| | | | | | | | | | | | | | | | | | | | Change-Id: I29d4a41d2b6c4ac5c7b27930257c3853500325a1 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| * | | Improve emission of FocusScope focusChanged signals.Andrew den Exter2013-02-275-31/+569
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Emit activeFocusChanged up the focus tree when an item receives a focus event, rather than when the focusItem changes which happens before internal state is sufficiently updated for hasFocus and hasActiveFocus to return the correct values from within a changed signal handler. There are some limitions to this. First the signals are not emitted reliably when the scene is not active which makes sense for activeFocus but not for focus. The second is in some instances the focus and activeFocus can update unnecessarily while the focus chain sorts itself out. QDeclarativeItem tests by Andreas Aardal Hanssen <andreas@hanssen.name> Task-number: QTBUG-28288 Task-number: QTBUG-25644 Change-Id: Ib3d17c42754c15a08b34c3388f50b45cc1d2a831 Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name> Reviewed-by: Alan Alpert <aalpert@rim.com>
* | | | Remove qaccessible2 bic data.Frederik Gladhorn2013-03-131-151/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I6fda0c0b8ce1b104b62cedf3ad71adadf6b4b3ea Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* | | | Fix qdeclarativelanguage test for installed builds.Friedemann Kleint2013-03-132-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compile failure due to auto-test-exported symbol qmlRegisterTypeNotAvailable(). Change-Id: Ia1ae312f1d7f8d3fcd93879780d01f7a8b1e0383 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | | | Fix warning about overloaded virtual in qmlviewer (CLANG).Friedemann Kleint2013-03-112-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Id5f3f66a353a360e98957541e339a28ad0d301e5 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* | | | Remove unused variable (CLANG).Friedemann Kleint2013-03-061-2/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I74d07deb862ff7099eaeeae93b04be3c7496c5c8 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | | | Fix warning about uninitialized variable (CLANG).Friedemann Kleint2013-03-061-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I7fd31373b4d08130c1fb44bb5b203331313558c3 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-2511-52/+1935
|\| | | | | | | | | | | | | | | Change-Id: I71384165752875c073dfbcbd279cfdc82eeea4dc
| * | | Flickable shouldn't grab the mouse until it starts an effective move.Andrew den Exter2013-02-224-28/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the boundBehavior prevents the flickable from moving its content item in response to a drag it shouldn't grab the mouse as that will prevent a parent MouseArea or Flickable from handling the drag. Task-number: 29718 Change-Id: Ief82ef7b898ea2581fd0b7e52548f451d887e2f1 Reviewed-by: Alan Alpert <aalpert@rim.com>
| * | | MouseArea shouldn't grab the mouse until there is an effective drag.Andrew den Exter2013-02-223-22/+137
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | A MouseArea shouldn't prevent a parent MouseArea or Flickable from handling a drag event unless it is going to do something useful with it. Task-number: QTBUG-29717 Change-Id: I17caa51ebc2e547e73e727fd185e60644591ad2b Reviewed-by: Alan Alpert <aalpert@rim.com>
| * | Copy builtins.qmltypes into the 'imports' directoryKai Koehne2013-02-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We used to copy builtins.qmltypes into qtbase/imports/QtQuick1, but install it into into $QT_INSTALL_IMPORTS. Unify this by copying it also directly into the imports directory. Change-Id: I9fe2feae4ff0da49d59d787b92ba2d7d4c47461d Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * | Add license files mandated by (L)GPL.Timo Jyrinki2013-02-194-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: If6ef4884fe1061767fa9d66462758d20389e9d3d Reviewed-by: Jason McDonald <macadder1@gmail.com>
* | | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2013-02-1987-182/+108
|\ \ \ | | | | | | | | | | | | refs/staging/dev
| * | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-1887-182/+108
| |\| | | | | | | | | | | | | | Change-Id: I4fd7f5c1096b0460bd23e2831e6207d63c2b69e3
| | * | Doc: Removed reference to deprecated \badcode command.Jerome Pasion2013-02-155-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDoc doesn't differentiate between \badcode and \code. They both look the same in the output. Change-Id: I3661a893a9413a0b137e236083cc9ac5677ffecb Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@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: I0c99526c56d4df0276965427d1cd5d89b574ecb7 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * | substitute fixed version numbers in qdocconf files with variablesOswald Buddenhagen2013-02-061-6/+6
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic87c7fdecbe3c5431d38b228e186237ccd2aed3b Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * | Merge branch 'release' into stableSergio Ahumada2013-01-312-2/+2
| | |\| | | | | | | | | | | | | Change-Id: Ied6e28f0e7e3dceccdbbe878dfab8f88c64e32d8
| | | * doc: Fix namespace version to 5.0.1 for qhp documentationv5.0.1Sergio Ahumada2013-01-121-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I995109869294f3106046a8fd8299b6300b4c567f Reviewed-by: hjk <qthjk@ovi.com>
| | | * test examples only in developer buildsOswald Buddenhagen2013-01-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we don't want to actually build examples in production builds any more, so the test is bound to fail. Change-Id: I5c936a5b193aa575a0193dcf0968cce9c20c505f Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | | * Merge branch 'stable' into releaseSergio Ahumada2013-01-0928-93/+195
| | | |\ | | | | | | | | | | | | | | | Change-Id: I1f4521205b6bb3811294fd2c32df4b4bce97d147
| | | * | point dependencies to 'release' branchesSergio Ahumada2012-12-181-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id025dd987dc759941cc4022ee6814e8f599b562c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| | * | | remove pointless conditionalsOswald Buddenhagen2013-01-3071-142/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it's not entirely clear why anything inside the declarative module would have a conditional on the presence of the declarative module ... Change-Id: Ie6e22840b6d1d63da90c7d02aedb14fd870191af Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * | | make use of qtHaveModule()Oswald Buddenhagen2013-01-2810-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6482af592a564dbbbab28b3f425ab2886f6d1bea Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | | | Fix QDeclarativeListView currentSection property updateNils Jeisecke2013-02-182-0/+33
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Model modifications that did not trigger the refill logic caused the view's currentSection property to contain an outdated value. A new autotest has been added to catch the bug. Task-number: QTBUG-29712 Change-Id: I88cf1295ac55dad7596b6ba1fe475ebf98a31026 Reviewed-by: Alan Alpert <aalpert@rim.com>
* | | | Remove QT_{BEGIN,END}_HEADER macro usageSergio Ahumada2013-01-28115-452/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The macro was made empty in qtbase/ba3dc5f3b56d1fab6fe37fe7ae08096d7dc68bcb and is no longer necessary or used. Discussed-on: http://lists.qt-project.org/pipermail/development/2013-January/009284.html Change-Id: Ic5b55b26967d65b3f11cac6fc3963f33ec6051a4 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Alan Alpert <aalpert@rim.com>
* | | | Remove export-declaration from inline function qmlRegisterType().Friedemann Kleint2013-01-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix MinGW-warning about invalid dllimport-directive. Change-Id: I12b2888c09de5b548fd3bd7e626717ee057de80c Reviewed-by: Jonathan Liu <net147@gmail.com> Reviewed-by: Alan Alpert <aalpert@rim.com>
* | | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-01-171356-19926/+18988
|\| | | | | | | | | | | | | | | Change-Id: I1175450886eca4dcaf7e81ae82fd112e541ad2f8
| * | | tst_bic: Add linux-gcc-ia32 bic dataSergio Ahumada2013-01-152-0/+17622
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding bic data for the following module: - QtDeclarative Change-Id: I9a6ab1e7b1f6bc5899fd2b0ba09bafd88c49744e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * | | Remove the Qt 4 BIC data for qtquick1Sergio Ahumada2013-01-151-18158/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We will not be testing BIC of Qt5 against Qt4 Change-Id: I4a19ca74b1f537e8ce2e0bd77120097967eb27c9 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * | | Doc: Remove duplicate consecutive wordsTopi Reinio2013-01-114-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Grepping through qdoc files, 'the the' appears in a few places. Also one instance of 'centre' replaced by 'center'. Change-Id: If978895c470ff02a0fe0c164aec421943deb24d3 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
| * | | Update copyright year in Digia's license headersSergio Ahumada2013-01-101347-1349/+1349
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0281c3f6c10bb7c57f0e470306f38e96badf997b Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * | | Remove QPerformanceTimer now that QElapsedTimer contains the necessary bitsRobin Burchell2013-01-098-415/+13
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | QPerformanceTimer was a copy of QElapsedTimer with some additional functionality which has since been subsumed into QElapsedTimer, so remove the forked code. (backport of cd6ebb4912a5d96c788ea0c838d8a1a06ff4029e from qtdeclarative) Change-Id: Ife1dac4d6c46404b43253680819da21350c65569 Reviewed-by: Christopher Adams <chris.adams@jollamobile.com> Reviewed-by: Alan Alpert <aalpert@rim.com>
* | | Merge branch 'stable' into devFrederik Gladhorn2013-01-171096-1005/+5359
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: sync.profile tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp Change-Id: I3620d15b4163fec420d18f6be50cae1635b99a2f
| * | Fix image source for networkaccessmanagerfactory exampleTopi Reinio2013-01-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Change the image URL to point to an existing image. Task-number: QTBUG-28374 Change-Id: Ied1ea7911757b1098847cb074b71650f9cc44776 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
| * | Improve tst_qdeclarativetextedit.Friedemann Kleint2013-01-072-60/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Base on QDeclarativeDataTest to locate test data. - Make small windows frameless to prevent errors from minimum size constraints of decorated windows on Windows. - Add test messages printing the value of comparisons. - Skip alignment tests if no reference image exists: Previously, the test would create an image file name "<testfile>-unknown-architecture", find out it does not exist, write out the 'actual' image under that name (clobbering the source directory) and compare to it, claiming success. The reference image name is now composed of platform and style name and the test is skipped if the file does not exist. Task-number: QTBUG-28611 Change-Id: If1496e11db9638e7febd3af637ad55d7c6f11409 Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
| * | Fix mistake in using == instead of =Thiago Macieira2013-01-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Found by clang: qml/qdeclarativexmlhttprequest.cpp:1324:24: error: equality comparison result unused [-Werror,-Wunused-comparison] Change-Id: Ie46678d6102f2e50bf87a53a9cbc14d114b4e334 Reviewed-by: Alan Alpert <aalpert@rim.com>
| * | Fix some warnings in qtquick1 found by ClangThiago Macieira2013-01-045-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qml/qdeclarativevme.cpp:286:26: error: destination for this 'memset' call is a pointer to dynamic class 'QObject'; vtable pointer will be overwritten [-Werror,-Wdynamic-class-memaccess] qml/qdeclarativemetatype.cpp:441:9: error: expression result unused; should this cast be to 'void'? [-Werror,-Wunused-value] util/qdeclarativefontloader.cpp:87:52: error: addition of default argument on redeclaration makes this constructor a default constructor [-Werror,-Wdefault-arg-special-member] qmlplugindump/main.cpp:180:75: error: unused parameter 'engine' [-Werror,-Wunused-parameter] qml/qdeclarativefastproperties_p.h:53:1: error: class 'QMetaObject' was previously declared as a struct [-Werror,-Wmismatched-tags] Change-Id: I1e91252d048e36e684a854ca1c6eb92e5a871444 Reviewed-by: Alan Alpert <aalpert@rim.com>
| * | Silence the Clang warning about overloaded virtual shadowing a previousThiago Macieira2013-01-041-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | There are a couple virtuals that are being overridden intentionally. We can't raise the previous virtual because they are privates. So the only thing we can do is disable the warning. Change-Id: Ie9c02e5d5a02d35c4cd7712c554be6e5cf5523a7 Reviewed-by: Alan Alpert <aalpert@rim.com>
| * | Add changes-5.0.1 fileSergio Ahumada2012-12-241-0/+51
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-26065 Change-Id: Idbc97cdcb3f7d4117e82ad8c7f0c552a617a930b Reviewed-by: Alan Alpert <aalpert@rim.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 13:53:30 +0000