summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* qmlplugindump1: make it behave more like qmplugindumpv5.1.0-rc1Fawzi Mohamed2013-06-101-8/+9
| | | | | | | | * use -nonrelocatable as flag * always emit meta object revisions Change-Id: I8bab4e4faf458f403dbfdc9e6c11c0ad17c27295 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* make use of qt_app.prfOswald Buddenhagen2013-05-281-5/+2
| | | | | Change-Id: Ibb906772daf7a6bc6d56874db0a4ced2cafa67a4 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* adjust to new "configure -nomake tools" semanticsOswald Buddenhagen2013-05-281-1/+6
| | | | | | | | this also reverts f47715f0a4 on the way, as this should make it obsolete. Change-Id: Ib54177b35f2378d7e6df497f546a8c4f19d00914 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Update all plugins.qmltypes files except webviewLiang Qi2013-05-272-2/+27
| | | | | | Task-number: QTBUG-31388 Change-Id: I16a137190c6a1ddba196b0624ade67c1e7fd9eed Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Tools: unnecessary to make qmlplugindump a bundleLiang Qi2013-05-271-2/+7
| | | | | | | | Embed Info.plist in qmlplugindump executable in a special way. Change-Id: Ia83cf15a1dc8c7e37560a280bd711ff2e4468ad8 (cherry-picked from qtdeclarative/4d173d5f16c103f640d4089feed44a74b14e9004) Reviewed-by: Liang Qi <liang.qi@digia.com>
* sync.profile: Point dependencies to an empty stringSergio Ahumada2013-05-261-8/+9
| | | | | | | | | | | This means that we are going to use the same branch name for the dependencies as the branch of the repository under test. If we are testing the 'stable' branch, all dependencies will point to the 'stable' branch as well. Change-Id: I9bc9d2df9ce434453c652ac97bb786e6400d5af1 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* Move debugger plugins into separate qml1tooling directoryKai Koehne2013-05-224-4/+4
| | | | | | | | | | Separate the QML 1 and QML 2 debugger plugins. This helps avoid a nasty crash in libgobject when (uneccessarily) loading and unloading the wrong plugins. Task-number: QTCREATORBUG-9232 Change-Id: I0bce7b364fcce983ccaa531d9008609ff08bb77f Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
* Cleanup and fix the Getting Started tutorialJ-P Nurmi2013-05-1581-3757/+159
| | | | | | | | | | The tutorial got messed up by 04cb8ef1. This change restores the core/ folder from within the gsQml/ backup folder and then deletes it. Task-number: QTBUG-31082 Change-Id: Ie18af90dbc70812dc7e74fdd1389a8734cf62fd4 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* iOS: fix build on iOSRichard Moe Gustavsen2013-05-151-1/+1
| | | | | | | | Currently, apps for iOS needs to be build through Xcode. So disable building tools for now, until a proper solution is ready. Change-Id: Ib31ad29d83c9043be94881e536975682adca4061 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Move exports conflicting with QtQml into namespaceKai Koehne2013-05-134-14/+94
| | | | | | | | | | | | | | Move exported qml* symbols that conflict with QtQml into an - automatically imported - namespace. This ensures apps can link against both QtDeclarative and QtQml. To keep the BC promise the old symbols are still exported. Task-number: QTBUG-29584 Change-Id: Icf4e586fee51d2bd82125398e2bb96d6dd355cc5 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* tst_qdeclarativeimage: it's OK to receive a network image in chunksShawn Rutledge2013-05-101-2/+2
| | | | | | | | | and if so, there can be more than 2 signals to update progress. Task-number: QTBUG-31065 Change-Id: I36294eb8a40c0e8d4beac29a8484260d5cfe6e73 Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Liang Qi <liang.qi@digia.com>
* Make sure correct files are bundled on Androidv5.1.0-beta1Eskil Abrahamsen Blomfeldt2013-05-031-0/+4
| | | | | | | The imports must be bundled in the apk. Change-Id: I44cd4b442f9f3c8b6bf3534ffbfb8866475599e4 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* 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>
* | 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>
* | 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
| * | 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
| * | | 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
| * \ \ \ 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
| * | | | | | 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
| * \ \ \ \ \ Merge branch 'stable' into devFrederik Gladhorn2013-01-171096-1005/+5359
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: sync.profile tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp Change-Id: I3620d15b4163fec420d18f6be50cae1635b99a2f
| * | | | | | | sync.profile: Point dependencies to 'refs/heads/dev'wip/androidSergio Ahumada2012-12-131-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should test dev branches against dev branches only by default. At some point we should automate the merges from release->stable->dev and/or decide how to handle possible conflicts. This is good enough for the time being. Change-Id: I15717ed1666bf939ddbe15c20df1858f480d60b7 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * | | | | | | Add a method that allows registration of files to typesAlan Alpert2012-12-059-1/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is currently no way in C++ to duplicate the functionality of a qmldir file in mapping QML files to versioned types in a module. This functionality would be useful both in cases where a separate qmldir file would be overkill, and for cases where the type mapping should be generated dynamically. Change-Id: I28d7898122c5556fcd7cf3476795bcf4bb288eab Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
| * | | | | | | Delay loading implicit importAlan Alpert2012-12-056-36/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As a performance improvement to avoid accessing the filesystem unecessarily, only import "." implicitly if types cannot be found in the existing imports. This is not a behavior change for type resolution, because "." already has the lowest precedence for type resolution. Change-Id: I8a8f10f7a790e6a02fc2c07c443f7be1984fc979 Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au> Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
* | | | | | | | 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
* | | | | | | | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 18:31:14 +0000