summaryrefslogtreecommitdiff
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-06-271-25/+32
|\ | | | | | | | | | | | | 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>
* | 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 remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-062-0/+78
|\ \ | |/ | | | | Change-Id: Ica2ac2d9c26eadad16509d0512817665566d829c
| * Dialog: Update the title on the window when changing it on the dialogAndy Shaw2019-03-292-0/+78
| | | | | | | | | | | | Change-Id: Id9c60bf10bc0d4fb28ee9a027b84e395e9cb745c Fixes: QTBUG-74350 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-022-0/+9
|\ \ | |/ | | | | 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-201-0/+8
| | | | | | | | | | | | Change-Id: I8af18ebfcc77f6080cfd5f0cade5042d0cd4a9a4 Fixes: QTBUG-73765 Reviewed-by: Mitch Curtis <mitch.curtis@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-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | ScrollView Tests: Allow for delayed update when loading new dataUlf Hermann2019-01-241-2/+6
|/ | | | | | | The ScrollView can render multiple times before the content is complete. Change-Id: I32513a96e51c4d91e53daa6204821a95d9cb1d52 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Calendar: Ignore any time specified for a minimum and maximum dateAndy Shaw2019-01-142-38/+50
| | | | | | | | | | | | Since Calendar only cares about the date part and not the time, we should ignore the time part when it is set as the minimum and maximum and manually set it to 0:00:00 and 23:59:59 respectively. This ensures that the day itself is still seen as valid irrespective of what time was passed to Date(). Change-Id: I57c311ffe7d3fb1ab69c59296a067a66f1007137 Fixes: QTBUG-71997 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Unskip test of fixed bugAllan Sandfeld Jensen2018-11-291-1/+0
| | | | | | | | Was never unskipped after being fixed Task-number: QTBUG-47523 Change-Id: Ibb193b45a73ca627ab3db7db8d1bf7b98f9ee8b4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* TableView: Handle dynamic insertion of TableViewColumns correctlyAndy Shaw2018-11-162-0/+90
| | | | | | | | | | When inserting a TableViewColumn after the TableView is created, then it needs to be inserted into the list of columns at the specified index so that it responds correctly to things like resizeColumnsToContents() Fixes: QTBUG-58594 Change-Id: If7ff545306fe8b6616d8e016eb87e565ed40c836 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* Refine startup benchmark termination conditionSimon Hausmann2018-10-313-12/+5
| | | | | | | | | Instead of using a timer to terminate the benchmark, let's terminate the benchmark after we've sent off the first rendered frame. This is a bit more realistic, although it doesn't change numbers on my machine. Change-Id: I9a3724ecf781191d2b4dd937a5b74960a19550df Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
* Improve startup benchmarkSimon Hausmann2018-10-311-15/+15
| | | | | | | | | Don't measure the time it takes to destruct the QQmlEngine, as that may be heavy work due to the last sweep of the garbage collector heap and deleting all engine-owned QObjects. Change-Id: Ibdd3d92e306d0418ee7080077b8894950878ec43 Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
* ScrollView: Defer calls to doLayout()Ulf Hermann2018-09-261-9/+17
| | | | | | | | | | | | | | | doLayout() updates the dimensions of the scroll view, and therefore can trigger the scroll bars to be shown or hidden. That, in turn, can trigger another call to doLayout(), resulting in binding loops. Avoid those by deferring the call. The scrollview tests are broken without this change because the binding loop prevents the scrollbars from being shown or hidden in some cases. The deferring necessitates a tryVerify(), but fixes the actual tests. Change-Id: I0dac0ba380240e025237f69c4d357d764a535c3d Fixes: QTBUG-50605 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Dialogs: allow preventing processing of standard buttonsAlberto Mardegan2018-06-292-0/+228
| | | | | | | | | | | | | | | | | Add an actionChosen() signal to DefaultDialogWrapper, allowing the developer to stop further processing of the event by setting the "accepted" field to false. This is especially useful when some validation on the dialog contents need to take place before the dialog can be accepted. [ChangeLog][Dialogs] Add a signal to the Dialog class to allow the client to intercept the button presses and optionally prevent further processing of the event. This allows performing some validation on the fields before dismissing the dialog. Task-number: QTBUG-69095 Change-Id: I19bca0bd9fcbafc72d337a5870776a96634ba748 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-05-261-13/+0
|\ | | | | | | Change-Id: Ie706f27a0c43ec1d1136310fba196d9b41a184ed
| * StatusIndicatorStyle: fix usage of ctx.createRadialGradient()Mitch Curtis2018-05-241-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | be4c4877b35ad1b6983cf194e61f0dad1d123af5 fixed Context2D's createRadialGradient() function, so our usage of it has to be updated accordingly. This patch results in the same visual result as it was originally (before the auto test failure). Task-number: QTBUG-68301 Change-Id: Ibd8aa24e84ceecccf25d7656350738a38cd03e24 Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Unblacklist tst_tumblerMitch Curtis2018-05-221-7/+0
| | | | | | | | | | | | | | | | | | | | The issue that was causing the tests to fail was most likey fixed by 12d80048. 41669ca6 unblacklisted other tests that were fixed by the that commit. Task-number: QTBUG-46393 Change-Id: Ib81e7b1afe0a60961c0b8ad3201802389c7bab01 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-05-191-0/+7
|\ \ | |/ | | | | Change-Id: I4194dd92ef851407e667bd1c635367a1bae97480
| * Temporarily blacklist tst_statusindicatorMitch Curtis2018-05-161-0/+7
| | | | | | | | | | | | | | | | | | The test seems to have started failing due to high DPI issues, but until the root cause has been found, unblock CI. Task-number: QTBUG-68301 Change-Id: Ia800eb2b568ee0abd35937e436b213321d035290 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-04-182-0/+71
|\ \ | |/ | | | | Change-Id: I00b66b03717563bb700f8a73c3bc295a55ac8c6a
| * Slider: don't break the binding on value when using the mouse wheelAndy Shaw2018-04-171-0/+33
| | | | | | | | | | | | | | | | | | When the wheel was used it could cause any binding on value to be broken since it was updated directly. Going via range.position ensures this is not the case. Change-Id: Ic041ea911cee68de34f5c4e184cf8460f5e002da Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Stop incrementing if the mouse is no longer over the buttonAndy Shaw2018-04-171-0/+38
| | | | | | | | | | Change-Id: Ibc95b14faaa77f200cf6ea5e05cb227e6a3628ca Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-02-2721-0/+319
|\ \ | |/ | | | | Change-Id: I4b1a4ebf258c9d31e537f42c8d0219c4294628bb
| * Merge remote-tracking branch 'origin/5.10' into 5.11Liang Qi2018-02-1221-0/+319
| |\ | | | | | | | | | Change-Id: I2d12dd7b271e17662295007f5cf25ff4b3b78e8e
| | * Calendar: make clicked(date) emit the correct date5.10Mitch Curtis2018-02-091-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calendar was implemented in such a way that pressing on a date selects that date, rather than releasing or clicking. With the current code, this presents issues when the month changes as a result of the press. For example, clicking on a date in an adjacent month will result in the clicked() signal passing the date under the mouse in the new month, instead of the originally pressed date. This patches fixes the issue by storing the pressed date and using it when emitting the released() and clicked() signals. Task-number: QTBUG-54129 Change-Id: I0c16293033b77f6ae783b5365d198b4a516af90b Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| | * Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-02-0220-0/+309
| | |\ | | | | | | | | | | | | Change-Id: I556a8404b908c15eaa71b009319c7f27274b40f1
| | | * Add creation benchmarks for qmlbenchJ-P Nurmi2018-01-2220-0/+309
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The qmlbench repo has benchmarks only for a subset of QQC2. They are part of a larger collection of benchmarks that are run periodically, for which the results are collected to Grafana. We have limited resources there, so we don't want to overload it with benchmarks for many QQC1 types. However, for our own benchmarking purposes it is useful to be able to easily benchmark these types. Change-Id: I9124791a93f07346dc80f1f08aedd655ed0cfa02 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | | ComboBox: guarantee index consistency when emitting activated()Alberto Mardegan2018-02-121-0/+55
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "triggered" signal from the ComboBox menu items is handled twice: once in ComboBox.qml, and once in QQuickMenuItem. The function of the latter is to update the parent QQuickMenu's selected index. With the current change we guarantee that the selected index (that is exposed as "currentIndex" in the public API) is updated only once, before any activated() signal is emitted. This also allows the handler of the activated() signal to update currentIndex at will, without running the risk of having it overwritten again by the ComboBox internal code. Task-number: QTBUG-51113 Task-number: QTBUG-43050 Change-Id: Ibfe12752d02eb4c9e2bf9a73ee8b3ab0ca8d7eaa Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-201-18/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Id56429b283aff90a18576cbd769b96fa1f0781fa
| * | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-01-191-18/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | Conflicts: src/dialogs/qquickabstractfiledialog_p.h tests/auto/controls/data/tst_combobox.qml Change-Id: I62e54d0a2e89d987e05e8dfad6ae6aac1a32cc72
| | * Fix tst_comboboxJ-P Nurmi2018-01-071-16/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a bogus timer firing once after the test had been running 500 ms. The timer was supposed to be used as a workaround on Mac, but since it had running set to true, it was actually firing once on all platforms. The timer was originally added in 6254af5. The test function ended up being skipped on Mac, so the timer was actually pointless. Task-number: QTBUG-64664 Reviewed-by: Liang Qi <liang.qi@qt.io> (cherry picked from commit a749525164b771452599e67e277d2ea6b3866479) Change-Id: Icebda05c872ba2de690e87bd0a9968670f203ce2 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| | * TreeView: avoid skipping some tests now that it has touchscreen supportShawn Rutledge2018-01-021-18/+0
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-47243 Change-Id: I19d06df099a9da253059d2d0aa4a290b41a17ada Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Re-enable skipped testsSami Nurmenniemi2018-01-0812-55/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | QtDeclarative was fixed with 781caafe1fde71b059c0e3a42bda77ce0d7e4c2a and tests pass now. Task-number: QTBUG-65521 Change-Id: Ibb88e17a182786f8299a6ab00bd74862aba548ce Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Re-enable tst_splitview for other targets than qemuSami Nurmenniemi2017-12-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Test was skipped for all the targets when it should only be skipped on offscreen platform. Task-number: QTBUG-65307 Change-Id: Id6ef2aefcf885447d4529caecdaf3514e52b3ebd Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | Skip test failing because of qemu crashSami Nurmenniemi2017-12-1912-1/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lots of tests fail when qemu crashes with output: "tb_lock: Assertion `!have_tb_lock' failed." These need to be fixed with QTBUG-65211. Task-number: QTBUG-65307 Change-Id: I7d7249d2e7c9a18d10e15a6e79f34dc1ec93e5d6 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-12-186-32/+130
|\ \ \ | |/ / | | | | | | Change-Id: Ie66ca17fe8ea49b3637accb468e206657346f4ab
| * | Tests_Slider::test_mouseWheel(): use fixed handle sizeMitch Curtis2017-12-181-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default handle size is based off the height of text on the system that the test is run on. By making the size fixed, we remove the possibility for small differences in compare results. Task-number: QTBUG-65224 Change-Id: I14061a028360340c6b284fb450bf1252014dc9b2 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-12-153-8/+110
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: If27d9c3cbc17765c4180651189c4b8d19b8409da
| | * Calendar: fix bug when NaN is displayed instead of dateOleg Yadrov2017-12-152-8/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I fixed a similar issue last year on the JavaScript side: 094ad30c94a72784449f43ef06d2172d644ab0fd At this time the same thing has been happening in C++. See QTBUG-54559 and the patch for a detailed explanation of the issue. In short, the problem with Calendar is that internally it uses QDate which does not keep information about time, whereas in the JavaScript world date is always combined with time. So, QDate(2017-10-15) is valid, but when during QDate -> JS Date transformation we add time to it (which defaults to midnight (00:00)), it becomes invalid in time zones where the Daylight Saving Time -> Standard Time transition takes place at midnight. To avoid switching the entire QQuickCalendarModel1 to using QDateTime, I modified its date(...) and dateAt(...) methods to return QDateTime with the time part always set to 12:00. That transformation required more changes in QQuickRangedDate1, because Calendar::selectedDate internally is QQuickRangedDate1::selectedDate, and I also had to fix "selected" property binding in the Base Calendar Style as it did take into account the time part of the date, which resulted in wrong behavior with my changes. Task-number: QTBUG-64068 Change-Id: Ia2f7703ff4e5811ef79438c97739da1d8001a7f5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| | * ScrollView: fix cyclic Tab navigationAlberto Mardegan2017-11-231-0/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ScrollView is not a control widget, which should be included in the focus chain when the user presses the Tab key; instead, it's a container and as such it should not interfere with the navigation. We also modify TableView, because it derives from ScrollView but we want to keep its current behavior. Task-number: QTBUG-64596 Change-Id: Ibd7833603d38171693b2f34c5859e9c4615b8ed4 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Fix tst_comboboxv5.10.0-rc3v5.10.0-rc2v5.10.0-rc1v5.10.05.10.0J-P Nurmi2017-11-231-19/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a bogus timer firing once after the test had been running 500 ms. The timer was supposed to be used as a workaround on Mac, but since it had running set to true, it was actually firing once on all platforms. The timer was originally added in 6254af5. The test function ended up being skipped on Mac, so the timer was actually pointless. Task-number: QTBUG-64664 Change-Id: I5b4803ba49db0ab7e1b4dd632a34d51af59bbf91 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | test: enable Tests_TableView::test_resize_columns() on b2qtSami Nurmenniemi2017-11-161-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Test was fixed by commit c84f7554894cef0cbeeba8a61f441286e190a797 in qtbase. Task-number: QTBUG-64523 Change-Id: I86195fe049c61ceab43566d004c8f6e6bfcee041 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-12-018-14/+91
|\ \ \ | |/ / | | | | | | Change-Id: Iadff14f78c9d4b5aca9cba8a2728c10b7963d8fc
| * | test: skip Tests_TableView::test_resize_columns() on b2qtLiang Qi2017-11-151-1/+1
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-64523 Change-Id: Icc369c1933a725321927f46255bb396800a0ac5d Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4Liang Qi2017-10-305-10/+54
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ia33462a31303ae79f7a6ef26dc6065a0afeef3e1
View Lorry Controller Status