summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Mark both benchmarks as such in the pro filesErik Verbruggen2017-05-122-1/+2
| | | | | | | | This enables them to be run with "make benchmark" Change-Id: I13ecd96087dd6586a47fb2abab269982f04803db Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Bump versionOswald Buddenhagen2017-05-101-1/+1
| | | | Change-Id: I0c6bfc205526ccdb6f80695b0d1dfdf7c7397afa
* Slider: Don't suppress updates by dragThreshold on non-touchscreensUlf Hermann2017-05-102-2/+2
| | | | | | | | | | | | When using a mouse, you want a slider to react immediately to input, not only if you move beyond a certain threshold. With the threshold it is very hard to accurately position the slider. On touchscreens, the threshold is necessary to allow for unrelated events, like flicking views, to not interfere with the value. Change-Id: I6cb8252338f20de559e062e738118593ffc1e099 Task-number: QTBUG-47081 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* texteditor example: Fix path to editpaste iconv5.9.0-beta4Friedemann Kleint2017-05-041-1/+1
| | | | | | | | | Drop prefix so that it can be found from either resources or files. Change-Id: Ib9dcab86f22bff0f8a3d7f0f22aa35d717b3569f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Disable/blacklist failing tests for boot2qtSami Nurmenniemi2017-05-021-0/+3
| | | | | | | | | Currently boot2qt is tested with QEMU and some tests fail. Disabling them for now to make it possible to enable qt5 tests for Coin. Task-number: QTBUG-60266 Change-Id: Ifabc4c4b93beda1990fc4f4d6e254dcd704f93fc Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Fix non-prefix builds on WindowsSimon Hausmann2017-04-261-2/+2
| | | | | | | | | | After commit 3ba11cf93820610273e2a16b13ab1d8c57a41d36 the shaders do not belong into QML_FILES anymore (and also don't need to be copied via COPIES consequently). Task-number: QTBUG-60214 Change-Id: I8d68fe76810c2d2d8945ef410a377aa2ce0068c1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* tst_dialogs: make QML errors visiblev5.9.0-beta3J-P Nurmi2017-04-241-5/+5
| | | | | | Change-Id: Ib466b1c42e232d75a022588e99e9e204a8c7bad9 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Fix packaging of shaders when qmlcache is usedJoni Poikelin2017-04-241-23/+7
| | | | | | | Task-number: QTBUG-60320 Change-Id: Iac74b469e971d28218fd35eadefb3c3b4bca4e51 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-04-184-7/+39
|\ | | | | | | Change-Id: Ife389a8fd4df1eef4f521ff734d02748b25ec184
| * Add NOTIFY signals for WheelArea5.8Marco Martin2017-04-033-6/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the private WheelArea component didn't have any notify signals in its horizontalValue/verticalValue or minimum/maximum values as well. this caused old values to be used in ScrollView.qml. If we want to have a listView that starts scrolled right when instanced, verticalMaximumValue won't be updated when the list is populated. Also, the wheelArea.verticalValue that's assigned at the beginning will be constrained by the wrong verticalMaximumValue, causing it to go out of sync with contentY. At this point the first time the mouse wheel is moved, the list will jump back at the top. Change-Id: I4605000636be7975ba9a58e2c79e8c2351e5a292 Task-number: QTBUG-59633 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| * Fix "Unable to assign Object to QString" warningJason Erb2017-03-111-1/+1
| | | | | | | | | | | | Change-Id: Ic219be7b90cbcde8fcc6a2e4d4a598a5d38b1d47 Task-number: QTBUG-47539 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Connect to QQuickWindow::visibleChanged using QObject member syntaxTor Arne Vestbø2017-04-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | To disambiguate from QWindow::visibleChanged. Otherwise we get a warning at runtime: QMetaObject::indexOfSignal: signal visibleChanged(bool) from QQuickWindow redefined in QQuickWindowQmlImpl Change-Id: I95f984cface59cd7ec5710235959a1054b26275a Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | Enable the use of QML caching at build timev5.9.0-beta2Simon Hausmann2017-04-113-5/+15
| | | | | | | | | | | | | | Task-number: QTBUG-58571 Change-Id: I11c9dfb4e0fad93b2961db4213f934eca7d214df Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Remove qrc based default qml distribution for QQC extrasSimon Hausmann2017-04-033-25/+3
| | | | | | | | | | | | | | | | This is consistent with the other modules and prepares for the use of qml caching. Change-Id: Ifab9187ac60a52d0464c5afe46772a9da1489c73 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Remove spurious Q_INIT_RESOURCE callsSimon Hausmann2017-04-033-7/+1
| | | | | | | | | | | | | | | | | | These explicit resource initialization calls are only needed when linking statically. Change-Id: I5518e1b32d4fc7c1d03d35dd15bf3ce65d5eafcf Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Fix warnings for -no-feature-itemviewsv5.9.0-beta1Nikita Krupenko2017-03-291-0/+2
| | | | | | | | | | | | Change-Id: I4dcca848212d6aed403bbed1a8b484ab269b3e47 Reviewed-by: Stephan Binner <stephan.binner@basyskom.com> Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* | Fix build with -no-feature-libraryPaul Olav Tvete2017-03-201-0/+2
| | | | | | | | | | Change-Id: I310e90ec92b81939df11accb4cb6b1bd25df472e Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Take enabled property into account when styling MenuBar itemTuomas Vaarala2017-03-111-2/+2
| | | | | | | | | | | | | | | | | | | | When the MenuBar item's property enabled is set as false: - Gray out the MenuBar item text. - Disable the blue highlighting of item when selected. Task-number: QTBUG-59335 Change-Id: I2fb0eb5539bdeaf487f0fc5d499ace72e6c916b7 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-03-101-0/+2
|\ \ | |/ | | | | Change-Id: Iaceb3ddf7d7314d43309a60967e93132954b230a
| * Prevent wheel events from escaping SliderJason Erb2017-03-021-0/+2
| | | | | | | | | | | | Task-number: QTBUG-42273 Change-Id: I31e77cbb5a149ad160f806529140165baf48c8ac Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Build fix for -no-feature-libraryPaul Olav Tvete2017-03-031-2/+3
| | | | | | | | | | Change-Id: I9339b134c8025e9f3e44933121e339a3107ad975 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Build fix for -no-feature-validatorPaul Olav Tvete2017-03-033-0/+9
| | | | | | | | | | Change-Id: Ib5c89c0934d5dbf2fe31c9ced09998c8a7405801 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Build fix for -no-feature-shortcutPaul Olav Tvete2017-03-032-0/+14
| | | | | | | | | | Change-Id: I63f1990f72d0eb736c5e1ecba5574bb13f9ef127 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Build fix for -no-feature-regularexpressionPaul Olav Tvete2017-03-031-0/+2
| | | | | | | | | | Change-Id: I211a325b0bd5fb1e5d48b1d378cdce39acb84c96 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Build fix for various widget featuresPaul Olav Tvete2017-03-032-4/+36
| | | | | | | | | | | | | | | | Make QtQuickControls build with -no-feature-spinbox, textedit, toolbar, itemviews, wheelevent, tabbar, tabwidget and slider. Change-Id: I780df0f624e885be03307908d4133d4ab91f8bea Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Build fix for -no-feature-picturePaul Olav Tvete2017-03-033-0/+9
| | | | | | | | | | Change-Id: I4ace999ad45dc299a9a0d9b24c87823c762f3821 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Merge remote-tracking branch 'qt/5.8' into 5.9Paul Olav Tvete2017-03-025-20/+91
|\ \ | |/ | | | | Change-Id: Ia4337204f3b69d63eb50d1b918685b098c77b48d
| * Made Button accept space key press and release eventsJason Erb2017-02-101-1/+4
| | | | | | | | | | | | Task-number: QTBUG-57853 Change-Id: I33cd09d78e470a85d0f816781e683b7574f673ab Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Fix feature dependenciesPaul Olav Tvete2017-02-063-19/+54
| | | | | | | | | | | | | | | | | | Build with -no-feature-filedialog, -no-feature-messagebox, -no-feature-colordialog, and -no-feature-fontdialog Change-Id: I0d63451a546014400f051645460a1fc1362eb753 Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| * Merge remote-tracking branch 'origin/5.8.0' into 5.8Liang Qi2017-01-261-0/+33
| |\ | | | | | | | | | Change-Id: I35027b94ab70362fc3932e3817c765f96c45e722
| | * Add changes file for 5.8.0v5.8.0-rc1v5.8.05.8.0Jani Heikkinen2016-12-091-0/+33
| | | | | | | | | | | | | | | | | | Change-Id: I63a99f4816101317576164d5c2335ffd9c02a86a Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | "to the empty string" => "to an empty string"Mitch Curtis2017-03-013-10/+10
| | | | | | | | | | | | | | | | | | Change-Id: I62f1fae431ce02c196c6ca582e0d033dbf38d836 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | Note that iconName requires QApplicationMitch Curtis2017-03-014-0/+9
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-37083 Change-Id: I3091776f4b4643136e67c9521efddb5462657d06 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | Fix build for -no-feature-tooltipStephan Binner2017-02-281-3/+3
| | | | | | | | | | | | | | | Change-Id: If4e71985a71d20dca7c49652a5b8957ab26c901f Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | Revert "tests: skip Tests_PieMenu::test_bounds() on Windows"Liang Qi2017-02-221-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f3a0c9680b264fc7f2f9e4ac3fe43d0c8321fbef. It got fixed by qtdeclarative 2a15f6c5. Task-number: QTBUG-58993 Change-Id: Ica846e5826bbf4ffc9f7d0e512816ab879a62ed9 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | Revert "tests: skip several tests in tst_treeview.qml"Liang Qi2017-02-221-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit cdd589d53c8f2f03c868cb618baf7f55956ebcb6. It got fixed by qtdeclarative 2a15f6c5. Task-number: QTBUG-49360 Change-Id: I0ad7f30c0bc442510a0918f0a61e64e966dd6676 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | Only remember the folder for the next time if the dialog is acceptedAndy Shaw2017-02-212-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the dialog is not accepted then it should not remember the last folder that was used. This should only happen if the user clicks on OK. [ChangeLog][FileDialogs] Remember the folder only when the file dialog is accepted. Change-Id: I69957e56e887affcab9933562274013fee686063 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | tst_gauge: try to stabilize test_gaugeTickmarkValues()Mitch Curtis2017-02-211-10/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | This is failing sporadically on Windows 10. Replace wait(0) with a more reliable tryCompare() check. Task-number: QTBUG-58859 Change-Id: Ia2010afd17051334717e944d8c303f757c14a6b0 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | tests: skip Tests_PieMenu::test_bounds() on WindowsLiang Qi2017-02-201-0/+2
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-58993 Change-Id: I5149cf70f9b49902005469b44d561744a4ca8667 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | tests: skip several tests in tst_treeview.qmlLiang Qi2017-02-171-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | Didn't find correct BLACKLIST way yet. Task-number: QTBUG-49360 Change-Id: I43ff4ccfd6f0b48088925a72ed8e8e6232607b78 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge remote-tracking branch 'origin/5.8' into devv5.9.0-alpha1Liang Qi2017-01-252-3/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I64e4c4f9ca56b263d8f00d3ba6a1067d78f26065
| * | ScrollViewStyle: Limit maximum scroll bar sizeKai Uwe Broulik2017-01-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Avoids the scroll bar overflowing its container. This can happen when e.g. contentWidth/height becomes zero. Change-Id: Ib01e65535ef1f11e32aaca8b19ec93f5ebf99736 Reviewed-by: Marco Martin <notmart@gmail.com> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | Bump versionOswald Buddenhagen2017-01-031-1/+1
| | | | | | | | | | | | Change-Id: I0dcea5046d944c871a335356ea0ab9b97fbdbd55
| * | [Desktop GroupBoxStyle] Don't hardcode textureHeightKai Uwe Broulik2017-01-021-1/+0
| |/ | | | | | | | | | | | | This fixes skewed GroupBoxes in Plasma's config dialogs when using larger fonts. Change-Id: Ie850658da3f47d57eed0904c26dbbb26457a83e8 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | test: delete tst_layout.qml and related filesLiang Qi2017-01-203-186/+0
| | | | | | | | | | | | | | | | They will be moved to qtdeclarative. Task-number: QTBUG-58294 Change-Id: I2fcc2fa07db07c2a90a68e77656140e7cf8cdc2b Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Remove support for WinRT 8.1 and Windows Phone 8.1Maurice Kalinowski2017-01-1925-1023/+0
| | | | | | | | | | | | Task-number: QTBUG-57288 Change-Id: Ic57422aab1232e4309a1a4e6d2101f46e7e7ee32 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | tst_tumbler: use TestCase's new createTemporaryObject functionsMitch Curtis2016-12-211-29/+47
| | | | | | | | | | | | | | | | | | This ensures that the appropriate objects are destroyed at the end of each test function, even if the test fails. Task-number: QTBUG-56491 Change-Id: I9dc8c99ab447eb665533af4690e7271f64457009 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | tst_piemenu: use TestCase's new createTemporaryObject functionsMitch Curtis2016-12-211-36/+34
| | | | | | | | | | | | | | | | | | This ensures that the appropriate objects are destroyed at the end of each test function, even if the test fails. Task-number: QTBUG-53520 Change-Id: Ic5935b3f7e530b8b4d2261fc68161ce4116fb325 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Update .gitignore to ignore .qmlc filesMitch Curtis2016-12-211-0/+1
| | | | | | | | | | Change-Id: I274aed038461045bb337f4d71f62a8c62a67df3f Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-11-2815-47/+82
|\ \ | |/ | | | | Change-Id: I753e8b4d10714f2b8c3cf0fccfed4dc312adbd9b
View Lorry Controller Status