summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* compile with QT_NO_CURSOR5.3Joerg Bornemann2014-09-173-0/+6
| | | | | Change-Id: Ied2bb3467f6d76cfab57bbd27c7f4b315c036d6f Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* compile with QT_NO_TOOLTIPJoerg Bornemann2014-09-171-0/+2
| | | | | Change-Id: I3d50df90315de4c73b5d49520585676197011072 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Make sure that the itemview's count property is reliableNils Jeisecke2014-09-106-8/+152
| | | | | | | | | | This fixes a missing countChanged signal when model changes happen while the itemview component is not completely initialized. Task-number: QTBUG-37115 Change-Id: I20c749b9e521b0292186adbecd09e1d362520881 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Bump versionFrederik Gladhorn2014-08-291-1/+1
| | | | Change-Id: I8eb3593fc738554c52999119439b5f5ff32933f7
* qmlplugindumper: do not pop up a window if an assert is triggeredv5.3.2Fawzi Mohamed2014-08-011-0/+11
| | | | | | | | | | On windows the debug version of qmlplugindumper used to show a panel on assert failure. Failure should be silent. Done-with: Thomas Hartmann <thomas.hartmann@digia.com> Task-number: QTCREATORBUG-12644 Change-Id: I0491ab745a546687772cd0d70fb6b8be0f03bb75 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Compile fix: do not use composeMode() if QT_NO_IM is defined.Steffen Imhof2014-07-021-1/+4
| | | | | | Change-Id: Ib0046657ba687e6427c67c7dce0d71ec3be87f48 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* Bump versionOswald Buddenhagen2014-06-181-1/+1
| | | | Change-Id: I83a2f252c5a0f105f4d0984652e41049009f8499
* Don't add the database before verificationv5.3.1stableRob Hoelz2014-05-291-1/+1
| | | | | | | | | | | | | | | The local storage facility exposed to QML has a bug; if you attempt to open a versioned connection, the version is wrong, and you try to handle that error, the connection is still stored in a connection pool, but in an unopened state. The next time you attempt to connect, no matter if you have the version right or not, the database handle will complain about being unopened. See also http://qt-project.org/forums/viewthread/38458/ Task-number: QTBUG-38543 Change-Id: I597497aab4895c868275a247ad96fb969e1c8ae5 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix copy and paste errorFrederik Gladhorn2014-05-141-1/+1
| | | | | | | | | | Fix error 13 identified by static analysis from http://www.viva64.com/en/b/0251/ This is in line with qtdeclarative. Change-Id: I3d3879bb93f9ae5bdcdd583645b1657f55140fdf Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Don't use a variable called 'interface'Thiago Macieira2014-05-071-13/+13
| | | | | | | | | MSVC has #define interface struct, resulting in a nonsensical error from the compiler about "struct: missing tag name" in a line that doesn't say "struct". Change-Id: I1ca703fd7920052e9d0bdf9a6936df77597ff022 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* qmlplugindump: Fix platform plugin specification.Friedemann Kleint2014-05-051-1/+1
| | | | | | | | Fix warning: Project WARNING: CONFIG+=qpa_minimal_plugin is deprecated. Use QTPLUGIN.platforms=qminimal instead. Change-Id: I33330bdbe7639de777b4f0fedd4ecadd184733bf Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2014-05-011-0/+27
|\ | | | | | | Change-Id: Ied69074622a6d08ded39acd7e9f7949c1dbaabf8
| * 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>
* | Bump MODULE_VERSION to 5.3.1Sergio Ahumada2014-04-231-1/+1
|/ | | | | Change-Id: Ifb2361ae4fe8e6d6e2f06dc20cb4c7b4739a7021 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-06 13:53:48 +0000