summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add 5.3 Changelogv5.3.0-rc1v5.3.0Alan Alpert2014-04-241-0/+27
| | | | | | | There was a bug fixed for this release. Change-Id: I428a01111874c70d2151213d2b3c555444333aaa Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* make QtQuick1 claim plugins of type 'qml1tooling'Oswald Buddenhagen2014-04-071-0/+2
| | | | | Change-Id: Ifd4d0da3e79fc087f56a3d3c8104e35a66ef47fc Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Ensure TextEdit's text is vertically aligned after resizing its height.Mitch Curtis2014-03-242-1/+14
| | | | | | | | | | | | | The current code only updates the alignment if the width of the TextEdit changed, but we must also check if the height has changed. Task-number: QTBUG-36069 [ChangeLog][QtDeclarative][TextEdit] Fixed TextEdit not vertically aligning its text after having its height changed. Change-Id: I428a01111874c70d2151213d2b3c5553e7f21186 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Correct QDeclarativeTextEdit::positionToRectangle().v5.3.0-beta1Mitch Curtis2014-03-202-1/+25
| | | | | | | | | | | d->yoff is the content offset when the content is not top aligned. This means that positionToRectangle() returned incorrect values when the content was bottom or vertical center aligned. In other words, it didn't apply the offset but gave coordinates from the beginning of the content instead of from the beginning of the item. Change-Id: I044b79434b9a67b0539050e39953d5889a3ed1db Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Fix typos in comments and documentationSergio Ahumada2014-03-0520-20/+20
| | | | | Change-Id: Ie7c4d63d632bf32ee583ddcd807252225ddde3fd Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* Revert "Dynamic GL support in Quick1's ShaderEffectSource"Laszlo Agocs2014-03-031-2/+1
| | | | | | | | | | | Will need to change to QOpenGLContext::currentContext()->isES() once the qtbase changes are in. This reverts commit 3eeaf987123f73ad7a4745745d9e7c70f30942cd. Change-Id: I7ac8718bc07cbcbaefe1633856722ae402078112 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Fix encoding of localized messagesKai Koehne2014-02-272-2/+2
| | | | | | | | | | | QDebug::operator<<(const char*) uses QString::fromUtf8(), while qPrintable(str) returns QString::toLocal8Bit(). This messes up e.g. the Russian translations. Task-number: QTBUG-35825 Change-Id: Ib3f0004df677196a0bd17ac48c65f2d51b833044 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Dynamic GL support in Quick1's ShaderEffectSourcev5.3.0-alpha1Laszlo Agocs2014-02-201-1/+2
| | | | | | | | | | Not strictly necessary but it is better not to call glEnable() with values that are not supported by GLES2. This way the error state will not polluted by an invalid_enum or similar. Change-Id: I952273f1814d9f124e5c4baa6196386645202439 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2014-02-171-0/+2
|\ | | | | | | refs/staging/dev
| * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-02-121-0/+2
| |\ | | | | | | | | | Change-Id: Ie11564446e707146f266f384fce794bd34b9d5f7
| | * Fix compiler warning in example.old/5.2Christian Kandeler2014-01-291-0/+2
| | | | | | | | | | | | | | | Change-Id: Ie57d6e5c8811a7845c55a069150de2fe0f796599 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | | Prospective build fix after commit f8dbed12266c42785c1e4758eed05833ec035f33 ↵Simon Hausmann2014-02-172-1/+11
|/ / | | | | | | | | | | | | | | | | in qtbase Pass through the QVariant argument provided by the caller (QInputMethod). Change-Id: Ia99546cd16287c14ce414d6aad0ea04488e7c6e2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Disable build for WinRTMaurice Kalinowski2014-02-041-0/+1
| | | | | | | | | | | | Change-Id: I9539aed1011325e201d7e32ea02b8c3fee77af30 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* | Normalize signal & slot signatures in connectionThiago Macieira2014-02-042-7/+7
| | | | | | | | | | | | | | Profiling shows Qt Creator spends 2% of its load time normalizing Change-Id: Id7ba78038c8504d960172923026245d28de182e8 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | Fix warning about unused variables in getting-started tutorial.Friedemann Kleint2014-01-291-0/+2
| | | | | | | | | | Change-Id: Ic7945d59fb0dd207997698259e770af626f9e7e7 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | Fix MSVC-warning about unused variable d in qdeclarativeitem.cpp.Friedemann Kleint2014-01-291-3/+2
| | | | | | | | | | Change-Id: I39fe8076e53d159b060db8884df108a790bc6469 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-170-0/+0
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I0f21f35cbace3cacbb0b2536c8f1eb6e11f025b5
| * Bump MODULE_VERSION to 5.2.2Sergio Ahumada2014-01-161-1/+1
| | | | | | | | | | Change-Id: I7d5d4708679d8fa8006428057b5acda87c1ede99 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Fix autotests expecting a trailing whitespace for qDebug streamKai Koehne2013-12-127-14/+14
| | | | | | | | | | | | | | | | The behavior of QDebug was fixed in qtbase. Update autotests accordingly. Change-Id: Ic39b7ddfc8a2fed6456ec617304aaf5035774e14 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-12-053-13/+9
|\| | | | | | | Change-Id: Ib5b91e20ee9aff1fb0eba6854fa517961f8fce5b
| * Merge remote-tracking branch 'origin/release' into stablev5.2.1Frederik Gladhorn2013-12-033-13/+9
| |\ | | | | | | | | | Change-Id: Id938fd62f7a500973b43f21e803f8b8c0c1a660d
| | * Allow QtDeclarative and QtQml to co-exist at run-timev5.2.0Simon Hausmann2013-11-263-13/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch changes QDeclarativeData to share the very first bit with QtQml's QQmlData, to indicate ownership by either run-time. We need to check the bit in the only QObject callback we use (destroyed), the other callback was unused and removed. Task-number: QTBUG-35006 Change-Id: Ife4b515648cba42b91612736ccd9375f1f46808a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-11-291-1/+1
|\| | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ia89f74de1281f7357cfa75b22b6d43e83b032ab2
| * | Bump MODULE_VERSION to 5.2.1Sergio Ahumada2013-11-251-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: Ie118f79e690ba82f6bc6410c3e8158d57f710060 Reviewed-by: Matti Paaso <matti.paaso@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * | Fix QML file in wigglytext-example.Friedemann Kleint2013-11-221-1/+1
| |/ | | | | | | | | | | Task-number: QTBUG-33871 Change-Id: I0dcd1fa10d82b929161afb044867983675064247 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-11-201-1/+6
|\| | | | | | | Change-Id: I2c6a554f6033ce83379f2338fd3064ab39674215
| * Debugger: Fix debugging with newer Qt Creator'sv5.2.0-rc1Kai Koehne2013-11-111-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | Make sure we advertise the QDataStream version, so that Qt Creator doesn't fall back to Qt_4.7. This is the minimal change necessary to achieve this. QtQml does actually consider the maximum data version announced on the client side, but that would require bigger changes in this module ... Task-number: QTCREATORBUG-10694 Change-Id: I1f0f005429e4d2736dc8661dd8c0d869279f856e Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2013-11-0828-32/+36
|\| | | | | | | Change-Id: I6556b93b0897a2df48a68238b8ab150541fcbb3f
| * tests: fix tst_qdeclarativemoduleplugin::incorrectPluginCase()Liang Qi2013-11-011-3/+7
| | | | | | | | | | | | | | | | | | It gives different error message based on the case sensitivity of the file system on Mac. Task-number: QTBUG-32646 Change-Id: I8b5986a4bc8886924e678692c6679e571a11dd33 Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
| * use private linkage where possibleOswald Buddenhagen2013-10-311-1/+1
| | | | | | | | | | Change-Id: Ia64fcacff77933a00df6eecd866f75466f4f99a3 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
| * tests: replace nokia with qtproject in tst_qdeclarativemodulepluginLiang Qi2013-10-3127-30/+30
| | | | | | | | | | Change-Id: Ia531065e3069aa010f99f91a8c8228788b3f0848 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-10-241-1/+1
|\| | | | | | | Change-Id: I636400c00ec6470d4dff4844a977ef0f5aa3a53b
| * tests: Replace Q_OS_MACX -> Q_OS_OSXv5.2.0-beta1Sergio Ahumada2013-10-211-1/+1
| | | | | | | | | | | | | | | | Use the correct identifier for the OS X operating system. Change-Id: I5f93d63fc7e3041a45485ca10ccf5a1bde04bb01 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | Bump qtquick1 version to 5.3.0Thiago Macieira2013-10-141-1/+1
| | | | | | | | | | | | Change-Id: I5d94fe1e2fde1ff898afbd9da93f77deeb0a1769 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-10-116-8/+12
|\| | | | | | | Change-Id: Iefc16b6899346b1d15bcf0e4394ede2eade3f933
| * remove stale phonon referenceOswald Buddenhagen2013-09-302-4/+0
| | | | | | | | | | | | Change-Id: I0ab1c16d2a9b593782f846ac11374ff9727d72c1 Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * Remove QtAlgorithms usage from QtQuick1.Friedemann Kleint2013-09-264-4/+12
|/ | | | | | | | QtAlgorithms is getting deprecated, see http://www.mail-archive.com/development@qt-project.org/msg01603.html Change-Id: I774f69bd3e60764a144b921a2383d832b38765ce Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Merge remote-tracking branch 'origin/stable' into devv5.2.0-alpha1Sergio Ahumada2013-09-18187-28/+32
|\ | | | | | | Change-Id: I46b53c8d8aaed59e548ccb8cadb60afd00ca7aa6
| * Doc: Move Qt Quick 1 demos and their documentationold/5.1Topi Reinio2013-09-16187-28/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When installing the examples, we currently end up with a QT_INSTALL_EXAMPLES/demos directory with nothing but documentation files. This change moves the docs and also the demos themselves into examples/declarative/demos. Also fixes the links in demo .qdoc files. Task-number: QTBUG-31722 Change-Id: Ied15526be1db8437e14be786ea69eae98af8dd3f Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2013-09-061-1/+0
|\| | | | | | | Change-Id: I061a46a31c7e16386a2040b4777bc797aaa635e2
| * Fix compilation for -no-opengl buildKai Koehne2013-09-041-1/+0
| | | | | | | | | | | | | | shadereffects is already included conditionally a few lines below. Change-Id: I8fd0a244708b0c5a820a0edc0fc9c9ce2e5513c0 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | QmlJs: Fix yet another instance of QmlJsParser...Tobias Hunger2013-09-032-2/+2
| | | | | | | | | | | | | | | | | | Same (!a == b) issue as everywhere else. Can we please unify all those parsers? They all are slightly different though, at least this issue, is never on the same line number. Change-Id: Ie2d1540d47b848ed0c7596b3f309c046b64390cf Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Remove unnecessary dependency to qtjsbackend from sync.profileSimon Hausmann2013-08-131-1/+0
| | | | | | | | | | Change-Id: Ic463237518c930fe367d0458859caa0050f45929 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Doc: several updates to the module page.Jerome Pasion2013-08-061-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | 1)Setting \qtvariable in module page. \qtvariable indicates the QT variable needed in .pro files. 2)WS fixes. Qt Quick 1 is deprecated but it is still nice to update the module page. Change-Id: I5358a03566589a6910469c0bbd4a717e90be1c34 Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Merge branch 'stable' into devSergio Ahumada2013-08-055-111/+136
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ic423a5bbe47dfa2b5d432e1af1032067d68b22e6
| * Keyboard input documentation: an event accepted does NOT bubble upJeremy Katz2013-07-311-2/+2
| | | | | | | | | | | | | | | | Add missing negation for the code snippet demonstrating accepting a key event Change-Id: Ia4c1cc4f207df9fb6e041ff088c6da2a63cd47b9 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
| * Fail tst_qdeclarativeborderimage::mirror() on Windows.Friedemann Kleint2013-07-291-1/+5
| | | | | | | | | | | | | | | | | | As expected. The test was using an invalid URL and thus successfully comparing 2 empty images. Task-number: QTBUG-32661 Change-Id: If6f0ad23454673b4b4fb2bc0a73da2b50663f171 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * Merge remote-tracking branch 'origin/release' into stableSergio Ahumada2013-07-261-0/+26
| |\ | | | | | | | | | Change-Id: I23fb0ae0d08e0cdcda7d17c70cb19f1e499e1475
| | * Add changes-5.1.1 filev5.1.1Sergio Ahumada2013-07-241-0/+26
| | | | | | | | | | | | | | | | | | Change-Id: I9062104d41ad4a4af352dc6366f550c09b3d8ebd Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
| * | Stabilize and fix tst_qdeclarativetextedit.Friedemann Kleint2013-07-251-49/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce a scoped pointer for the views to ensure cleanup after failing tests. Fix calculation in positionAt() to use a QPaintDevice and the first line of the text. Move calls to QDeclarativeView::setFocus() below activation for it to set the "active" focus item correctly. Task-number: QTBUG-32538 Change-Id: Ibf10d00b9bddd587f5721d5b5011f6eafc617f39 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 22:08:13 +0000