summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * Fix bic baseline dataJan Arve Saether2013-04-301-28/+3
| | | | | | | | | | | | | | | | | | | | | | Caused by https://codereview.qt-project.org/54820 I actually tried to avoid this with https://codereview.qt-project.org/54837 but my assumption was wrong. Change-Id: Ibf8ba1031a84745dfec65d300a73e10c6728393d Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * Doc: Remove instructions for using qtdemo from examples READMETopi Reinio2013-04-161-35/+5
| | | | | | | | | | | | | | | | | | The Qt Examples and Demos Launcher is not maintained anymore. Edit the README to mention Qt Creator as the way to find and launch examples. Task-number: QTBUG-28388 Change-Id: I507b0af3888185a0cb86a3e71cab9115b9275892 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
| * test: Remove CONFIG+=parallel_test from tst_examplesSergio Ahumada2013-04-111-2/+0
| | | | | | | | | | | | | | | | This fails quite often on Mac because it gets mixed with the same test in qtdeclarative.git while testing qt5.git Change-Id: I58f3f9d8e64b080a2a78fdedb409acd68324c8f8 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-04-032-0/+24
| |\ | | | | | | | | | Change-Id: Ia3d23c08fddda65432bb5b3e3c7889abf524d936
| | * disable module when widgets is not availablev5.0.2Tasuku Suzuki2013-03-221-0/+2
| | | | | | | | | | | | | | | | | | Change-Id: I3849f3dfb1d33bf15053fae864393d5755a2ea8d Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * Add changes-5.0.2 fileSergio Ahumada2013-03-201-0/+22
| | | | | | | | | | | | | | | Change-Id: I75fe0526bb3698cbbe6555cbb13eb32fd1bfa3c6 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-04-036-8/+27
|\| | | | | | | | | | | Change-Id: Iec94e513079426e5d87bdd24753863038cee573e
| * | Fix warnings for QtQuick1Thiago Macieira2013-04-021-0/+1
| | | | | | | | | | | | | | | | | | | | | qpacketprotocol.cpp:299:12: error: variable "writeBytes" set but not used [-Werror=unused-but-set-variable] Change-Id: I04a33119b30669dda688591aee60dcb2b7bbd41b Reviewed-by: Alan Alpert <aalpert@blackberry.com>
| * | Doc: Fix faulty code snippet in QDeclarativeEngine class referenceTopi Reinio2013-04-021-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | A common way to access the engine instance is via QDeclarativeView - fix the code snippet accordingly. Task-number: QTBUG-20747 Change-Id: Iff837f834ca6c950aa6c78c418f544789b4fcaf9 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
| * | Fix a bug where completed was emitted twice when duration was zero.v5.1.0-alpha1Thomas Kristensen2013-03-262-4/+20
| | | | | | | | | | | | | | | | | | | | | Change-Id: I72c16f3affb297985e9e5d2e9f524537212d06ad Reviewed-by: Michael Brasser <michael.brasser@live.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name>
| * | Use qmake for package dependency resolution in cmake tests.Stephen Kelly2013-03-262-2/+2
| | | | | | | | | | | | | | | | | | | | | This allows us to remove hardcoded depends information. Change-Id: I55a678dce0cfe84871d3bd2de10a5df2465bf08c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | Fixed some declarative auto testsBernd Weimer2013-03-273-35/+32
| | | | | | | | | | | | | | | | | | | | | | | | This is a backport from qt5/qtdeclarative (commit c460a83 + a fix in qdeclarativeimage) Change-Id: I90f292dea76d3da30930a663b37f8e624b210c2b Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2013-03-275-16/+25
|\ \ \ | | | | | | | | | | | | refs/staging/dev
| * | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-03-265-16/+25
| |\| | | | | | | | | | | | | | Change-Id: I82c73a1924fa659312e4b34df2b038def2d8d959
| | * | Bump MODULE_VERSION to 5.1.0Sergio Ahumada2013-03-251-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I5362a735a0982eedad071a307e1a423eaee57041 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * | Merge branch 'dev' into stableSergio Ahumada2013-03-19135-656/+292
| | |\ \ | | |/ / | |/| | | | | | | | | | | | | | This starts Qt 5.1 release cycle Change-Id: Ic10a8c118053323004cafe1b4bffd990a16aaf7f
| | * | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 15:02:49 +0000