summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge 5.13 into 5.13.1v5.13.15.13.1Paul Wicking2019-08-061-0/+2
|\ | | | | | | Change-Id: Ic8aa394d28a116b80c257b330d294ff016f173dd
| * BLACKLIST Tests_Picture::test_source for msvc-2019Heikki Halmet2019-07-311-0/+2
| | | | | | | | | | | | Task-number: QTBUG-75276 Change-Id: Ief49097b9ff5b26a93afdcdc6357975d87f3363f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Add changes file for Qt 5.13.1Antti Kokko2019-07-311-0/+20
|/ | | | | | | | | | | | | | | | + 4acab46571b793d7a00c9fe768d9ca91a47ea6bb Blacklist several failing tests in extras on MSVC 2019 + 84fbb48832e984c7fce1c4091adb0d340974a75f Don't specify null to indicate an invalid QModelIndex + 87f79ca0cfe432b7758fa19472cc7133275818c5 Bump version + 8105e3ed0e77f363ccc6406edd38082ac5cef27d Add changes file for Qt 5.12.4 + 0f74e642bf1f13f6b097b1a8e1412ca3cb6e85b5 Exclude the resources when building statically as qmake will handle this + 558eb844d59185d944c233348d2fef649e90b643 Stabilise flaky test + dc9ccfb331119d319c7a620c075d04355e4745cf Skip Tests_ScrollView::test_dragFetchAppend + 0ee7134d24bccb965a134dd1f4267a0bfda3de61 Bump version + 4e156bb26fb904663b0e13df1802dc2e0788b114 Bump version + 42812dfd813745beed928e40621ae9deb88a9247 Doc: Replace example file lists with links to code.qt.io Change-Id: I72cf998aac4f64b7eee176466466994f28572ca9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-07-110-0/+0
|\
| * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-110-0/+0
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I212c99525128943f17361665d7d9149346f9ffee
| | * Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | | | | | Change-Id: Ic894f3b21f7734067ba0d0375101179306580c55
| | * Skip Tests_ScrollView::test_dragFetchAppendMitch Curtis2019-07-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's notoriously flaky, with several attempts to stabilise it so far, and it's now blocking 5.13. I would blacklist it, but QTBUG-74117. Task-number: QTBUG-55727 Change-Id: I653f534ed712fa5af9bcf6340faee2cae2f1c99b (cherry picked from commit 6b62b506d6eb06271e082dcedaf75fd588a5b17c) Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | | Doc: Replace example file lists with links to code.qt.ioTopi Reinio2019-07-093-0/+3
|/ / | | | | | | | | | | Task-number: QTBUG-74391 Change-Id: If30143e106fec5a8694c47ab2376aeda36faf8e1 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | Change-Id: I942b7eb034f160f96869cdaddf01fe9950a6b42e
* | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-06-282-25/+52
|\ \
| * \ Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-06-272-25/+52
| |\ \ |/ / / | | _ | | | | | | | | Conflicts: .qmake.conf Change-Id: I6c5ee0a59f5ba747611d8f6fdf97fdb7b88f97b9
| * Stabilise flaky testDimitrios Apostolou2019-06-261-25/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | Spread small delays in the test to mitigate severe flakiness on MacOS_10_12 platform in our CI. This is not a proper fix. It is acceptable because the module is deprecated and because it should greatly improve the instability of our CI. Fixes: QTBUG-76570 Change-Id: If2d7d15dffe23c7e0644b233e7757c04574c89d4 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| * Merge "Merge remote-tracking branch 'origin/5.12.4' into 5.12"Qt Forward Merge Bot2019-06-172-1/+21
| |\
| | * Merge remote-tracking branch 'origin/5.12.4' into 5.12Qt Forward Merge Bot2019-06-172-1/+21
| | |\ | |/ / | | | | | | Change-Id: I19610f79e1fd1f4b3033e6b11a3fef1f55c03a62
| | * Add changes file for Qt 5.12.4v5.12.45.12.4Antti Kokko2019-05-231-0/+20
| | | | | | | | | | | | | | | Change-Id: Id92e40dfd234f6bc2367131a17819c29cd4999a4 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * Bump versionFrederik Gladhorn2019-05-231-1/+1
| | | | | | | | | | | | Change-Id: I7dd2516d56d49985154ad0f2f129646cffbeb721
* | | Merge "Merge remote-tracking branch 'origin/5.13.0' into 5.13"Qt Forward Merge Bot2019-06-201-0/+18
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/5.13.0' into 5.13Qt Forward Merge Bot2019-06-201-0/+18
| |\ \ \ |/ / / / | | | | | | | | Change-Id: I25583d6e380b4b28ce226cda11307d656c7b1c8c
| * | | Add changes file for Qt 5.13.0v5.13.0-rc3v5.13.0-rc2v5.13.0-rc1v5.13.0-beta4v5.13.05.13.0Antti Kokko2019-05-101-0/+18
| | | | | | | | | | | | | | | | | | | | Change-Id: Ieef4fa6ffb88aa7dbbdd539c62ac79c967d2bf3e Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-06-081-1/+1
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-06-081-1/+1
| |\ \ \ \ |/ / / / / | | | _ / | | | / Change-Id: I8c71c934d005841d9512b29bd6d5285f966033f1
| * | | Exclude the resources when building statically as qmake will handle thisAndy Shaw2019-05-281-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As qmake will combine all the QML files etc together for us in static mode then we should not include those added to the resources explicitly in the pro file otherwise we will end up with an extra copy. Additionally, if qrc:/ was added to the import path list it would end trying to load the files from there and not from the qrc:/qt-project.org/imports location as a result. Change-Id: Icbaea7c6103074f9468914365b099be4589bee37 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Blacklist several failing tests in extras on MSVC 2019Shawn Rutledge2019-04-291-0/+8
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-75276 Change-Id: I3b377588e58a613fcd37e5ec5ed39a9fc1cd996c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-05-281-1/+1
|\ \ \ | |_|/ |/| |
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-05-281-1/+1
| |\ \ |/ / / | | _ | | Change-Id: Idc2e5ad567f83eb85d51d1e21c38bcd96436a24f
| * Don't specify null to indicate an invalid QModelIndexAndy Shaw2019-05-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Since this call is done on the C++ side, there is no means to equate null as being the same as QModelIndex(). As that is the default value when calling index(), we can just drop the argument in this case. Change-Id: I97b80064978b7af01f0606ed6f3778349adc4277 Fixes: QTBUG-74523 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-204-11/+42
|\ \ | |/ | | | | Change-Id: I4bb2b57f7f091074b0c4d17cad4748843e806dd0
| * Merge remote-tracking branch 'origin/5.12.3' into 5.12Qt Forward Merge Bot2019-04-171-0/+34
| |\ | | | | | | | | | Change-Id: Ic6c8c79b7a38191221980f62936bb0f7135881b9
| | * Add changes file for Qt 5.12.3v5.12.35.12.3Antti Kokko2019-04-051-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | + 46425199ebcdd4cb9facb471f67e17a941ca103f Fix blacklisting of auto tests + c901f6d2ee7f73f58881424b05d57360720fa7d9 Bump version + 1edf84eff083eb5412b4c5c7cd3bd8166f15f61f Dialog: Update the title on the window when changing it on the dialog Change-Id: I8ea33bd0ea313857aef450c9d4bf4ecd48dca257 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * | Create the decoration component when it is neededAndy Shaw2019-04-163-11/+8
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | If multiple QQmlEngines are created and use a Dialog, initalizeEngine will be called more than once and therefore recreates the QQuickAbstractDialog::m_decorationComponent without deleting the original. Therefore we keep the decoration component url instead, and create the decoration component on demand. This ensures that it keeps the component relevant for the QQmlEngine and stops the memory leak from before as well. Fixes: QTBUG-75149 Change-Id: Ic79103f42d092d39b46868a45b4099ddc6edf9db Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | Fix scroll position after resizev5.13.0-beta3v5.13.0-beta2Allan Sandfeld Jensen2019-04-081-1/+6
| | | | | | | | | | | | | | | | We didn't update the position if it ended up with an invalid value. Fixes: QTBUG-63437 Change-Id: Idc4d3b0cb43fd63bdb0ff10b4162dfabe49455df Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-063-0/+80
|\ \ | |/ | | | | Change-Id: Ica2ac2d9c26eadad16509d0512817665566d829c
| * Dialog: Update the title on the window when changing it on the dialogAndy Shaw2019-03-293-0/+80
| | | | | | | | | | | | Change-Id: Id9c60bf10bc0d4fb28ee9a027b84e395e9cb745c Fixes: QTBUG-74350 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-03-270-0/+0
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I8c72cfdfde1bef36bee9acdbc41652485a9f261e
| * Bump versionKari Oikarinen2019-03-211-1/+1
| | | | | | | | Change-Id: I3d2d235fc7df5e437642213e4011b9162bf55af9
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-03-162-2/+32
|\ \ | |/ | | | | Change-Id: I3c0359e9e51bc1ee5b098d250c13c586e57b483c
| * Merge remote-tracking branch 'origin/5.12.2' into 5.12Qt Forward Merge Bot2019-03-152-2/+32
| |\ | | | | | | | | | Change-Id: I8816a9d3e27cf79950b94fefd3bce86923c125c5
| | * ScrollViewStyle: Avoid division by zero in extent computationv5.12.25.12.2Benjamin Robin2019-02-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the flickableItem content is empty (contentWidth / contentHeight is equal to 0), prevent the division by zero in the computation of the extent variable. Task-number: QTBUG-73691 Change-Id: I86becca9a1fa2508d1acafe09f46dfc952e4e96d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * Add changes file for Qt 5.12.2Antti Kokko2019-02-241-0/+30
| | | | | | | | | | | | | | | Change-Id: I84ec16966ef9a06fde339d7f80dedcf95807cded Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Update plugins.qmltypes for Qt 5.13Kai Koehne2019-03-136-2936/+1135
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-73739 Change-Id: I4e25e1bef8640c0afe21c82217da114e77ba0cf7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta1Qt Forward Merge Bot2019-03-027-6/+45
|\ \ \ | |/ / | | | | | | Change-Id: Ib614fd58e4df83945017bbb3bf2cbc9d5a72df4c
| * | Fix blacklisting of auto testsOliver Wolff2019-02-281-0/+1
| |/ | | | | | | | | | | | | | | | | When doing shadow builds, the BLACKLIST file can only be found if QTEST_SET_MAIN_SOURCE_PATH is set. Fixes: QTBUG-74117 Change-Id: Icfb76c313800fefbb68f911779d5ef058b67cf40 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Update the CalendarHeaderModel when changing the locale setAndy Shaw2019-02-203-2/+14
| | | | | | | | | | | | Change-Id: I8af18ebfcc77f6080cfd5f0cade5042d0cd4a9a4 Fixes: QTBUG-73765 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Merge remote-tracking branch 'origin/5.12.1' into 5.12Qt Forward Merge Bot2019-02-011-0/+27
| |\ | | | | | | | | | Change-Id: Ib988d0deb1931a06fe96881e18760e7c52686bb0
| | * Add changes file for Qt 5.12.1v5.12.15.12.1Antti Kokko2019-01-101-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 0489c0a88a293696592c5892383698a015ae68c7 Improve startup benchmark + 602f1225938f9338c3ee799c64d5449ebc12b8bc Refine startup benchmark termination condition + cf957e407030fc260bd86882cf2f79724126abdd Bump version + 10b3bffbd21b6265a3d124f310c99fcbac2b027f TableView: Handle dynamic insertion of TableViewColumns correctly + 6b7f91c097f7e47cf2683d08b5838fd061a872bd Add changes file for Qt 5.11.3 + 50b6fb27458708a18f4114e3ebec0fa632b2659f Unskip test of fixed bug + 80ba7e03afe18cc44715f7cf9a038bedff01f328 QQuickTreeModelAdaptor1: fix out of range issue in selectionForRowRange + 8abf15b4ba974576e13f37b09117454fc1e6b1d9 Static: Install the qmldir for the Styles module + a9436b597916d5619cbbbbd103bc482ddaf4359a Static: Register the base style qml files so they can be found + 69c7e95da101d4d66d25c4850f3591d4ccd2bbc1 Insert before next item when it exists + bd952e904070d8eb07748d620829e9dadb8022ba Bump version Change-Id: I26d4c9fd88ddc3c17cad7a0b75b63b3527da03b0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Fix progress indicator with vertical progress barJoni Poikelin2019-01-281-2/+1
| | | | | | | | | | | | | | | | | | Fixes: QTBUG-65209 Change-Id: I1cdd2809e4bc3f2d37421fa785c84b1fa0b9d12e Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| * | Fix incorrect transientScrollBars binding in BasicTableViewShawn Rutledge2019-01-281-2/+2
| | | | | | | | | | | | | | | | | | Fixes: QTBUG-69041 Change-Id: I7ad62850c8890d7ec53678754a164ad2bcfbdb8e Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | | Skip Tests_ScrollView::test_dragFetchAppendMitch Curtis2019-02-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | It's notoriously flaky, with several attempts to stabilise it so far, and it's now blocking 5.13. I would blacklist it, but QTBUG-74117. Task-number: QTBUG-55727 Change-Id: I653f534ed712fa5af9bcf6340faee2cae2f1c99b Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | Tests: Fix warnings about ignored return valuev5.13.0-alpha1Friedemann Kleint2019-02-061-2/+2
| | | | | | | | | | | | | | | | | | | | | Check return value of Test::qWaitForWindowExposed() Change-Id: I21dd077d2610b6a374e2e6ad943ee39e0b6d4e79 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Fix deprecation warningsFriedemann Kleint2019-02-063-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Private/qquicktreemodeladaptor.cpp:744:52: warning: ‘void QList<T>::swap(int, int) [with T = QQuickTreeModelAdaptor1::TreeItem]’ is deprecated: Use QList<T>::swapItemsAt() [-Wdeprecated-declarations] Private/qquicktreemodeladaptor.cpp:750:52: warning: ‘void QList<T>::swap(int, int) [with T = QQuickTreeModelAdaptor1::TreeItem]’ is deprecated: Use QList<T>::swapItemsAt() [-Wdeprecated-declarations] Private/qquickstyleitem.cpp:922:89: warning: ‘int QFontMetrics::width(QChar) const’ is deprecated: Use QFontMetrics::horizontalAdvance [-Wdeprecated-declarations] In file included from /data1/frkleint/qt-513/qtbase/include/QtGui/qfontmetrics.h:1:0, Private/qquickstyleitem.cpp:942:60: warning: ‘int QFontMetrics::width(const QString&, int) const’ is deprecated: Use QFontMetrics::horizontalAdvance [-Wdeprecated-declarations] Private/qquickstyleitem.cpp:961:75: warning: ‘int QFontMetrics::width(const QString&, int) const’ is deprecated: Use QFontMetrics::horizontalAdvance [-Wdeprecated-declarations] Private/qquickstyleitem.cpp:1010:52: warning: ‘int QFontMetrics::width(const QString&, int) const’ is deprecated: Use QFontMetrics::horizontalAdvance [-Wdeprecated-declarations] Private/qquickstyleitem.cpp:1010:86: warning: ‘int QFontMetrics::width(QChar) const’ is deprecated: Use QFontMetrics::horizontalAdvance [-Wdeprecated-declarations] Private/qquickstyleitem.cpp:1469:46: warning: ‘static bool QPixmapCache::find(const QString&, QPixmap&)’ is deprecated: Use bool find(const QString &, QPixmap *) instead [-Wdeprecated-declarations] ../../../src/controls/Private/qquicktreemodeladaptor.cpp:744:52: warning: ‘void QList<T>::swap(int, int) [with T = QQuickTreeModelAdaptor1::TreeItem]’ is deprecated: Use QList<T>::swapItemsAt() [-Wdeprecated-declarations]/data1/frkleint/qt-513/qtbase/include/QtCore/../../src/corelib/tools/qlist.h:227:10: note: declared here ../../../src/controls/Private/qquicktreemodeladaptor.cpp:750:52: warning: ‘void QList<T>::swap(int, int) [with T = QQuickTreeModelAdaptor1::TreeItem]’ is deprecated: Use QList<T>::swapItemsAt() [-Wdeprecated-declarations] tst_qquicktreemodeladaptor.cpp:1387:39: warning: ‘QModelIndex QModelIndex::child(int, int) const’ is deprecated: Use QAbstractItemModel::index [-Wdeprecated-declarations] Change-Id: I213d7ffd2cb329b542f9273e3a566a813d1cc24f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
View Lorry Controller Status