summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Skip failing autotest tst_qdeclarativetextedit::delegateLoadingv5.5.15.5Kai Koehne2015-09-171-0/+3
| | | | | | | | | | | | | | The test failures point to a race condition in QtNetwork when a socket is prematurely closed by the server. Anyhow, the race condition has been there before, just that a recent change in Qt5Core made it more likely to be hit. Disabling the test for now: This is better handled in qtbase, and shouldn't block the release. Task-number: QTBUG-48299 Change-Id: If6877d47940d422e94b6d20d24a8fbdb89692f71 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.4' into 5.5Liang Qi2015-08-190-0/+0
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I70e0e7aa8d1a6146ff5b18b3a38131714a45d67b
| * Bump version5.4Oswald Buddenhagen2015-04-201-1/+1
| | | | | | | | Change-Id: I7c1be89eed9b487c78e000704973f2cc66d683ae
* | Add the GPLv3 license textThiago Macieira2015-08-132-0/+688
| | | | | | | | | | | | | | LGPLv3 refers to it but does not include it in its body. Change-Id: Ib056b47dde3341ef9a52ffff13eed18cf3504738 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Doc: Replace Mac OS X with OS XNico Vertriest2015-07-167-7/+7
| | | | | | | | | | | | Task-number: QTBUG-40759 Change-Id: I1c05a2d07f38da1129bc127fd17c15f843b16bda Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* | QtDeclarative: fix const correctness in old-style castsThiago Macieira2015-07-102-7/+8
| | | | | | | | | | | | | | Found by GCC's -Wcast-qual. Change-Id: Ia0aac2f09e9245339951ffff13c95df89028fe1c Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | Bump versionOswald Buddenhagen2015-06-291-1/+1
| | | | | | | | Change-Id: Ie3d7f68d9a8bf85fbedcb0913ed9144fcc4808dd
* | Reanimate tests/auto/declarative/qdeclarativewebviewv5.5.0-rc1v5.5.0Friedemann Kleint2015-05-292-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Add CONFIG += testcase to qdeclarativewebview.pro. Use QTRY_VERIFY in multipleWindows(). Before this change, the test was not executed at all because "make check" was an empty target due to missing CONFIG += testcase. Add QEXPECT_FAIL to tst_QDeclarativeWebView::multipleWindows(). Change-Id: I7395876466f6d3b4c326336e47fb40bb6a60838e Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Turn the QDeclarativeView Qt Designer plugin into a uiplugin.Friedemann Kleint2015-05-192-2/+2
| | | | | | | | | | | | | | | | | | | | The plugin does not link to any Qt Designer classes, so, uiplugin is sufficient. Task-number: QTBUG-44724 Change-Id: Ibecdccd7080c0752d5605c33f2bbe4e9eb0a0e44 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
* | Remove duplicated Qt Designer plugin from tools.Friedemann Kleint2015-05-185-206/+0
| | | | | | | | | | | | | | | | This code was never compiled, the Qt Designer plugin is under src/plugins. Change-Id: Ic25dc965bcca458322c089a3b5dfe4765fec0556 Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
* | tst_qdeclarativeimage: update big256.pngv5.5.0-beta1Shawn Rutledge2015-04-221-0/+0
| | | | | | | | | | | | | | | | | | | | | | The test started failing, presumably because due to a libjpeg update, jpeg decoding has changed subtly. Task-number: QTBUG-45708 Change-Id: I51594a0ad47e323164e16cfcd39496569b515e75 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
* | Fix Blackberry and QNX 6.6 buildSergio Martins2015-03-293-3/+3
| | | | | | | | | | Change-Id: I647f478f9b888ed2bcdbda263446b82165c957e4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Remove the old headersclean unit testThiago Macieira2015-03-252-3/+0
| | | | | | | | | | | | | | We have configure -headersclean now Change-Id: I157caec69f11e0b50e1de760e6832ca1da97bc6e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | QtDeclarative: fix const correctnessThiago Macieira2015-03-1711-41/+44
| | | | | | | | | | | | | | | | | | Add const_cast where we're really violating the correctness. Found by GCC's -Wcast-qual. Change-Id: Iee8cbc07c4434ce9b560ffff13c9619c48672f5a Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
* | Merge remote-tracking branch 'origin/5.4' into 5.5Frederik Gladhorn2015-03-171-1/+0
|\| | | | | | | Change-Id: I9c521184dcdc023bdaecf6643bb6c60cc1a80a9f
| * Doc: Removing url variable from qdocconf file.v5.4.2Sergio Ahumada2015-03-061-1/+0
| | | | | | | | | | | | | | | | -url inherited from the url variable set in qtbase/doc/global Change-Id: I448ea5484c6956c6231e7a6ff93e29157e527755 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5v5.5.0-alpha1Frederik Gladhorn2015-02-2415-35296/+93434
|\ \
| * | Merge remote-tracking branch 'origin/5.4' into 5.5Frederik Gladhorn2015-02-2015-35296/+93434
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I85eac7ffdbd673aeba4e7437fa5a9dc50759a736
| | * bic: Add/Replace 5.{0.1,2,3,4}.0 bic data for linux-gcc-amd64Sergio Ahumada2015-02-137-35291/+93413
| | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the ia32 data since there are no linux x86 machines in the CI system (which makes the data useless from an automated testing point of view) and most people use x64 these days anyway. Change-Id: Ica9ac9728f99b0341a17c120f0564f20f05d5c48 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| | * Merge remote-tracking branch 'origin/5.4.1' into 5.4Frederik Gladhorn2015-02-103-0/+10
| | |\ | | | | | | | | | | | | Change-Id: I854c8bff922c0ffcaf2ea6daec00c12e9bed540e
| | | * This test seems to be unstable on some platformsv5.4.1Lars Knoll2015-02-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We've had some failures with this test in the CI system. Ignore it as we plan on deprecating qt quick1 anyway. Change-Id: If882598dfd0cdb13b588ca9ad4074d61b8574d19 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
| | | * Fix empty arrays in QML 1Robert Griebl2015-01-082-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 9cbb6fa added a regression, where empty arrays would produce errors in QML 1. Change-Id: Ie5c784d5ec921d1ca69084750ed37fc2e273bbef Task-number: QTBUG-43656 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| | * | Fix Url in layoutitem example.Friedemann Kleint2015-02-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix warnings: WARNING: Unexpected stderr: QDeclarativeComponent: Component is not ready QGraphicsLinearLayout::insertItem: cannot insert null item found while mass-testing examples. Change-Id: I0af369ca7f4d59d822ed7b0c8bd8dcd4cc34ead7 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
| | * | Autotest: Use resources for test dataRainer Keller2015-02-053-3/+9
| | | | | | | | | | | | | | | | | | | | Change-Id: I011b6be94b56baf58f3ee47d0b805932bb94a7f8 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
| | * | QDeclarativeTextEdit: fix use of uninitialised value.David Faure2015-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Detected by valgrind (in Qt 4.8.6): ==27068== Conditional jump or move depends on uninitialised value(s) ==27068== at 0x70C7289: QDeclarativeTextEdit::updateTotalLines() (qdeclarativetextedit.cpp:1742) Change-Id: I17856a6d5e06f10f2daf5f3534c175526f21b5dc Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| | * | 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>
* | 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.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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 14:16:33 +0000