summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | Bump versionOswald Buddenhagen2015-01-161-1/+1
| | | |/ | | | | | | | | | | | | Change-Id: I3c95c3c20a14cf1342e87c3026b294fe2996c592
| * | | Update copyright headersAntti Kokko2015-02-231317-7501/+7381
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I9e68d256991ef7325c29c38ce9c007506ce6b150 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| * | | Replace Q_WS_MAC macro in tst_qdeclarativeflickable::flickVelocity()J-P Nurmi2015-02-231-1/+1
| |/ / | | | | | | | | | | | | | | | Change-Id: I15889eee3cee1513e49576be40a7abf97a31da45 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | | Bump versionOswald Buddenhagen2015-02-241-1/+1
|/ / | | | | | | Change-Id: I97bef8bdf910f2f0f29187f39c022a5df06e82cc
* | Fix autotest to not rely on broken operator<<(QDebug, QUrl) behaviorKai Koehne2015-02-131-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QmlInfo does call nospace() in the constructor. However, the streaming operator for QDebug di permanently reset this to space(), which the autotest relies on. This got fixed in qtbase change 868201155fd, letting this autotest fail. Move QUrl to the end of the chain so that the broken behavior of QUrl isn't checked anymore. This is a cherry-pick of change 2aec854665f62e2177 in qtdeclarative. Change-Id: I40f775749392e1c7516b9316706976862025f806 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/devFrederik Gladhorn2015-01-191-2/+2
|\ \
| * \ Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-01-021-2/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I7a07ebd7ccf3fc9ec26f7bbf2936b1a787c097f7
| | * Fix change-of-sign warning detected by ICCThiago Macieira2014-12-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | subscribeIndex is quint16, so it can't store a value of -1. Store 65535 instead. Note: in findgeneric, subIdx will NOT be -1. It will be 65535. Change-Id: I4b5ad6415609f409660a035de6f763ddb2da2f7e Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * Bump versionOswald Buddenhagen2014-12-121-1/+1
| | | | | | | | | | | | Change-Id: I2ff94f952edc3add07c0b53bb54d042a61fe23c2
* | | Add missing includes.Friedemann Kleint2015-01-071-0/+1
|/ / | | | | | | | | | | | | | | After qtbase/90e7cc172a7521396bb2d49720ee4ceb9a9390b3, QStringList no longer includes QDataStream. Change-Id: I25c86ab233a79e71a4e0723c729a571014012cb8 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* | [TextLayout] Drop unused memberKonstantin Ritt2014-12-141-16/+0
| | | | | | | | | | | | | | | | QStaticTextItem never uses `chars` and `numChars`. A respective change to QStaticText will follow. Change-Id: I004a2e5d61841de63775d8207b5fd0bdf416f4c7 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/devSimo Fält2014-12-032-1/+5
|\ \
| * \ Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-11-212-1/+5
| |\ \ | | |/ | | | | | | Change-Id: I5fbaf737a8aa58d34aa0eacef4adc5352e0ddbf8
| | * Extend timeout in tst_qdeclarativetextedit::delegateLoadingv5.4.0-rc1v5.4.05.4.0Frederik Gladhorn2014-10-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On some CI machines (OS X 10.7) this test actually passes but takes 5100 ms to load the delegate. Task-number: QTBUG-42264 Change-Id: I008cbf0e163257c800370951920384108e5a390b Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| | * Skip failing test dataAlan Alpert2014-10-271-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test is crashing on windows, skipping it will at least allow the other parts of the test to run. Task-number: QTBUG-30131 Change-Id: Iff420c71c29a482641275da938bfcb8c43a45042 Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | | Change test data from 6.7 to 6.5Simo Fält2014-12-032-3/+3
|/ / | | | | | | | | | | | | | | | | Applying QtDeclarative's, 205336ebc859e670a4d06524ce65a22befc0eab4 to QtQuick1. Change-Id: I285b35cbc727e847c45dab22e232640d9faaac21 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* | Do not use QMetaType::registerType.Jędrzej Nowacki2014-11-191-19/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | The function is transitional from Qt4 to Qt5. It should not be called. The patch is a semi cherry-pick of: 14e247e4b94df17ed62750b4468c2ac25aabe30f a49154a75005403185e3813d441fb3e1931af2a2 1f74dde59f8ecb8be3a41973ab5d8d435815edd6 from qtdeclarative. Change-Id: I5f90a58d6fa8d1df69e149da22e17e234173dd68 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-10-272-10/+22
|\ \ | |/ | | | | Change-Id: I48df1568991f8c8bb6836b1d323710805a98ef44
| * tests: tst_qdeclarativelanguage: fix filesystem case sensitivityShawn Rutledge2014-10-222-10/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | importIncorrectCase() and errors(incorrectCase) give different error messages depending on the case sensitivity of the file system on OS X. Those are in turn different than error messages on other operating systems with case-sensitive filesystems. This patch is very similar to the one that was done in qtdeclarative: 2ebf4ba4710a01a038d05cfea741e5538bb4567f for QTBUG-37622 Change-Id: Ib13d717712cf88b476ca7edd8aababd7f5456c50 Task-number: QTBUG-41961 Reviewed-by: Liang Qi <liang.qi@digia.com>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-10-204-0/+8
|\ \ | |/ | | | | Change-Id: I89edb0c7d2d7abd6ac5a14f9f5afcb60f722734a
| * Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-10-144-0/+8
| |\ | | | | | | | | | Change-Id: I320a0ae55f27db5a8bcb50c2574c3f92fbf35e63
| | * 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>
* | | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-10-091-0/+2
|\ \ \ | |/ / | | | | | | Change-Id: I51b5541943de39d87eed4887a879eeacb3a7e376
| * | Blacklist constantly failing test case on Mac OS Xv5.4.0-beta1Kalle Viironen2014-09-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | tst_qdeclarativetextinput fails on Mac OS X Task-number: QTBUG-41316 Change-Id: I86724ecf0196ab4728f3bf14fcfc6cfe18bc20d1 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-09-19610-12170/+7287
|\ \ \ | |/ / | | | | | | Change-Id: I64648cf46b65e9396ef58b8f7ed8437bf2339e7e
| * | qmlplugindump: Use _CrtSetReportMode() for MSVC only.Friedemann Kleint2014-09-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix warnings when using MinGW: main.cpp: In function 'int main(int, char**)': main.cpp:734:55: warning: statement has no effect [-Wunused-value] _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_DEBUG); ^ main.cpp:735:53: warning: statement has no effect [-Wunused-value] _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_DEBUG); ^ main.cpp:736:54: warning: statement has no effect [-Wunused-value] _CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_DEBUG); where _CrtSetReportMode() is an empty macro. Change-Id: Ibd9024246f59e0c5d1a6a6a017cd680fd60b0113 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
| * | Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4Frederik Gladhorn2014-09-186-8/+152
| |\ \
| | * \ Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-09-166-8/+152
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I842b005b9818c9e201a09d51bcf418e2dd0a1ef9
| | | * 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
| * | | Use QSignalSpy instead of waitFor in tst_qpacketprotocolUlf Hermann2014-09-171-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our CI metrics tell us that this test is in much better shape in QtQuick2 than here. So let's apply the only differing change here, too. Change-Id: I1985f20ba36b94d698699173fb911e393b31c215 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| * | | Remove qtdemo from gitignoreRainer Keller2014-09-171-1/+0
| |/ / | | | | | | | | | | | | | | | | | | QtDemo was removed with a commit in qtdoc. Change-Id: I73c11c66933d23565e38e3e93e1300b794a80f6a Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
| * | Update license headers and add new license filesv5.4.0-alpha1Antti Kokko2014-08-25608-12159/+7118
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: I736aeb1a53f8aac59e8df360447864fea64d3dee Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
| * | Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-08-121-0/+11
| |\ \ | | |/ | | | | | | Change-Id: Ie53408303d45db4bbc2030d3076f1ec868afedb2
| | * qmlplugindumper: do not pop up a window if an assert is triggeredv5.3.25.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>
* | | Bump versionOswald Buddenhagen2014-08-091-1/+1
|/ / | | | | | | Change-Id: I45794952049658ec8d6a41a0b9d3da40be6ba549
* | Fix Flickable mouse grab issue.Robert Griebl2014-08-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | This issue cannot be reproduced on the desktop with a mouse (at least I could not). It can however reliably be reproduced on iMX6 embedded hardware with a touch-screen. It seems like the TS driver is reporting mouse events with a much more coarse granularity than the USB mouse driver, which in turn triggers this bug. (Qt4's declarative, as well as Qt5's quick1 and 2 all have the same issue) Change-Id: I01c9fc433a78d5f79518786783e24f3f93eaa50a Task-number: QTBUG-27185 Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
* | Add handling of value-type lists to QDeclarativeExpression::evaluate()Robert Griebl2014-08-052-1/+23
| | | | | | | | | | | | | | | | | | | | | | QDeclarativeExpression::evaluate() converts all arrays to QList<QObject *>, even if the items cannot be represented by a QObject *. In case of a string-list, a QList of null-pointers is returned (which isn't very helpful). This patch makes evaluate() convert arrays, which contain ONLY value-type items, into a plain QVariantList. Change-Id: Ib8452cf9dd0241f146955f5de35336f48b9007c1 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-07-291-1/+4
|\ \ | |/ | | | | Change-Id: Ib65e8d81071452904ec3b0423e91dca1b0101452
| * 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>
* | QDeclarativeError::toString: improve handling of empty urls.David Faure2014-07-2619-56/+58
| | | | | | | | | | | | | | | | | | | | | | | | "file::2:23: ..." is strange to read. Show "<Unknown File>:2:23: ..." instead, by treating empty urls (including "file:") as unknown, and by still showing line and column numbers in such a case. This change makes it possible for QUrl::fromLocalFile("") to return an empty url rather than "file:", which this module was relying upon in the tests. Change-Id: Id6d8aaa73673283cb65cbd1316dca77f859a3f8f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Avoid direct GL calls in Quick1Laszlo Agocs2014-06-272-28/+26
| | | | | | | | | | | | Change-Id: I72c78f3c2920d7c27c013eaad39259a7c7009940 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* | Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-06-260-0/+0
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ibcd05d8dcf19133830920d9eba3fa1450b3d3de1
| * Bump versionOswald Buddenhagen2014-06-181-1/+1
| | | | | | | | Change-Id: I83a2f252c5a0f105f4d0984652e41049009f8499
* | Fix tst_qdeclarativeapplication on OS XSergio Ahumada2014-06-031-1/+7
| | | | | | | | | | | | | | This change is similar to qtdeclarative/a292bcb1438034a24e95ec08be04a76ba832d793 Change-Id: I2d758d6725b32a8f9779e14560b9b61271a5cb97 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | Fix tst_qdeclarativetextinput::copyAndPaste() for asynchronous clipboard ↵Sergio Ahumada2014-06-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | notification. Change qtbase 6a61a00ddb21e79412e82069dfef50192bfd724d for Windows uses new clipboard notification API that results in asynchronous clipboard notifications. This change is similar to qtdeclarative/a7122f3b2832ad65cfd0ab0ce0315a7042ee9f92 Change-Id: I3bb85f7dbc258f8f93cde8af1c9b24286b99ce21 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2014-06-035-16/+43
|\ \ | |/ | | | | | | | | | | | | Conflicts: .qmake.conf src/declarative/qml/qdeclarativemetatype.cpp Change-Id: I133752e1df91677925005fa8c1268b32fba312ea
| * Don't add the database before verificationv5.3.1stable5.3.1Rob 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>
View Lorry Controller Status