aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix calendar testsv5.14.0-alpha1Ulf Hermann2019-09-182-8/+9
| | | | | | | | | | The actual names of the components are MonthGrid and WeekNumberColumn, not AbtractMonthGrid and AbstractWeekNumberColumn. We should at least accept the real names. Fixes: QTBUG-78470 Change-Id: I01bf7174fd0c790b3b24d867bc823651fbdbe8c7 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"Qt Forward Merge Bot2019-09-1112-18/+342
|\
| * Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-09-1112-18/+342
|/| | | | | | | Change-Id: I60cfd7fbece6d34349767d13d376b7494eb525b2
| * DialogButtonBox: fix standard buttons not being translatedMitch Curtis2019-09-116-1/+247
| | | | | | | | | | | | | | | | | | | | | | | | | | When calling QQmlEngine::retranslate() after component completion, buttons in a DialogButtonBox were not being retranslated. For now the only way to be notified of language change events is by installing an event filter on the application, but in the future we can use the solution to QTBUG-78141 instead. Change-Id: Ibc435c3829945489adcbaa8a813013fe735a9c38 Fixes: QTBUG-75085 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
| * QQuickIcon: prevent detach-ing when there is nothing to changeKonstantin Ritt2019-09-102-1/+14
| | | | | | | | | | | | | | saves a bunch of pointless detach attempts on each deep-copy Change-Id: Ibb1ae99bd54b2d35f9c9aa9e541fb03891ad94ec Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * QQuickIcon: properly resolve implicit values - take 2Konstantin Ritt2019-09-101-6/+6
| | | | | | | | | | | | | | | | | | | | | | This is a follow up of 382531ab5e2270833d3805c57c00ebcf6b24d635, and amends 1241c80eca725c9ac46a0b94d6bdec11a5d00302 . when the property has not been set explicitly, the resolved mask must not contain a respective bit set either Change-Id: I45a334b51fce09ead8e30fe3326a94f35b0f4f56 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-09-083-6/+40
| |\
| | * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-09-083-6/+40
| |/| | | | | | | | | | Change-Id: Ifa88045268cdaa1adc0b1e206d5e20a3721d3837
| | * Merge "Merge remote-tracking branch 'origin/5.12.5' into 5.12"Qt Forward Merge Bot2019-09-071-0/+28
| | |\
| | | * Merge remote-tracking branch 'origin/5.12.5' into 5.12Qt Forward Merge Bot2019-09-071-0/+28
| | |/| | | | | | | | | | | | | Change-Id: I9f62c952a3a059601c1486806c0fb4189ffc368d
| | | * Add changes file for Qt 5.12.5v5.12.5Antti Kokko2019-08-261-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 335314146dece4fa86c661a4094a2f73e5e81a43 Doc: Fix documentation warnings for Qt Quick Controls 2 + 761df2ced0081905b4238c66783bb276f504cf3d Accessibility: Switch should have checkbox as role + 2ea51ddea2b903d8115648a89d56b1e4b551e660 Accessibility: Remove redundant checkbox role code + 48f587be28e8b46e93703d7a4393b915b224495f Doc: Add specs about focus property + 188773bd1383883cd7247b6ded0d0b1a41689155 Doc: correct name of property in snippet + bb88d84475f7c4bb69528da5096f4d2c91667a3c Add a test for having a ShaderEffect as a delegate + 3574033d526c0a78236148354e1f48d7b9aafe10 Bump version + ce7c431fb23157fa5125d1102a594de045818a72 Fix crash in QQuickContainerPrivate::removeItem + 1d06eb3f8215b67c5061ee3a076df405724ff7ee Fix Flaky tests + da06da57002b64cf4bcde0ca708b3275a5f919ae QQuickTextArea: prevent changing size of background recursively Change-Id: I139ae9181197f900aab385bd0a93c6902d3b22f1 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * | QQuickIcon: properly resolve implicit valuesKonstantin Ritt2019-09-062-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when the property has not been set explicitly, the resolved mask must not contain a respective bit set either Change-Id: Iab0bd600b5bf458e26ed4601d4d2f608021f1518 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | | Merge "Merge remote-tracking branch 'origin/5.13.1' into 5.13"Qt Forward Merge Bot2019-09-061-0/+31
| |\ \ \
| | * | | Merge remote-tracking branch 'origin/5.13.1' into 5.13Qt Forward Merge Bot2019-09-061-0/+31
| |/| | | | | | | | | | | | | | | | | | Change-Id: Ifc5dd206734f3d6a64d106fa38e14139f52274b7
| | * | | Add changes file for Qt 5.13.1v5.13.1Antti Kokko2019-08-121-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 335314146dece4fa86c661a4094a2f73e5e81a43 Doc: Fix documentation warnings for Qt Quick Controls 2 + 7d001497ddcda501c55aac35b4c7a60980d9c6b5 Fix flaky tst_qquickmenu test + 9310d5fb5285ae5eb4b94c01606791319b775b85 Container: Keep currentIndex at 0 when removing item 0 if possible + 7431b0549a9bb69f5f4a036fc931683dd4e20d2c tst_accessibility: Simplify role verification + c49bb5bda32477a878b6b82b99f853cef1340890 CursorDelegate: stop cursor timer when interval is set to 0 + 1427b243cb69768e7ce2e6ea3ad75619deac104b Don't unnecessarily transform keysequences into strings + 4259e99c1990dc88632b85d945e9093cca47a831 doc - use the correct attributions file + e23d4b68f3f3b1467f032e4ce3501dab0feb5fee Material: account for accent color in flat highlighted button's ripple + 33e590ea30931306e055fe4a6ae38da8b3fe3d0c Bump version + 783bfd2182f667817213faf3f54a285057bd2456 Add changes file for Qt 5.12.4 + 761df2ced0081905b4238c66783bb276f504cf3d Accessibility: Switch should have checkbox as role + 2ea51ddea2b903d8115648a89d56b1e4b551e660 Accessibility: Remove redundant checkbox role code + 48f587be28e8b46e93703d7a4393b915b224495f Doc: Add specs about focus property + 188773bd1383883cd7247b6ded0d0b1a41689155 Doc: correct name of property in snippet + bb88d84475f7c4bb69528da5096f4d2c91667a3c Add a test for having a ShaderEffect as a delegate + 7ded94bf0eb2b78f37bb9f84a0cc36e4ec520023 SplitView: fix preferredHeight not being restored in restoreState() + b00d649f109b080b7068c4a7a2a7731d7fb51ea1 Simplify test a bit and make it less error-prone (adding type-safety) + 463a55d9593d6b03e09db440008e8b9320a28bc5 Binary compatibility file against Qt5.13.0 for QtQuickControls2 + 13bdd61c6597586f62558ca337c193ce03db26cc Bump version + 3574033d526c0a78236148354e1f48d7b9aafe10 Bump version + ce7c431fb23157fa5125d1102a594de045818a72 Fix crash in QQuickContainerPrivate::removeItem + 4f5da1ed1dc1d294c1c79b9f6124cedeaa45c4b6 Doc: Replace example file lists with links to code.qt.io + 83813e43405109478769010acf2caf85a4229501 QQuickComboBox: emit countChanged signal when model is updated + 1d06eb3f8215b67c5061ee3a076df405724ff7ee Fix Flaky tests Change-Id: I856bfc432911684bc0057d1b196fc456ce8f4819 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | | | tst_dial: fix copy-paste mistakeMitch Curtis2019-09-061-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Slider was incorrectly used in a03b6fec6. Change-Id: Ib76172f9ea0dca3b776a74df2329bd63c72f8517 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | | | Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"Qt Forward Merge Bot2019-09-0669-271/+366
|\ \ \ \ \
| * | | | | Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-09-0669-271/+366
|/| | | | | | |/ / / / | | | | | | | | | | Change-Id: Ie9314e1a5daa20cee9d95a3c42873dbe515b3333
| * | | | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-09-067-39/+93
| |\ \ \ \
| | * | | | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-09-067-39/+93
| |/| | | | | | | |/ / | | |/| | | | | | | Change-Id: I859406dc779e59ee5d8e2980e04f8be28b1a69aa
| | * | | ComboBox: document the behavior surrounding the accepted() signalMitch Curtis2019-09-062-18/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I65be8e54ded284d2f80b5a1f301b75223bd81bb3 Fixes: QTBUG-75338 Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| | * | | Fix flakiness in tst_qquickdrawer testsMitch Curtis2019-09-062-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Although it's not ideal to add arbitrary delays to tests, it does reflect a more realistic testing environment, and more importantly, seems to fix the flakiness on OpenSUSE. (cherry picked from commit 97fc102cd079f32cc1a4f00a764ceea981699fc0) Fixes: QTBUG-77946 Change-Id: I2998611759106386091d7375b31e56523c95371f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | | Modernize Gallery example by using Action where suitableKonstantin Ritt2019-09-051-17/+24
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I45c693941e88074eb63f9e6a498c85c1dfa93e9a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * | | QQuickPopup: fix compiler warningKonstantin Ritt2019-09-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > warning: unannotated fall-through between switch labels > note: insert 'break;' to avoid fall-through Change-Id: Ia70fb6b666f874a245a113d61a6cb3e8e7aa2712 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * | | Minor typo fixKonstantin Ritt2019-09-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I335e59f09c48a8b52c7f690cedba95952c5adfa3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | | | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-08-311-1/+1
| |\ \ \ \
| | * | | | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-08-311-1/+1
| |/| | | | | | |/ / / | | | | | | | | | | Change-Id: Ia89d3600269126768ede2305dcf60d968f772fb7
| | * | | Doc: Rename section title for 'TabBar'Topi Reinio2019-08-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Having a section title identical to a QML type name caused links intended to go to the QML reference to link to this page instead. Fixes: QTBUG-77840 Change-Id: I06219a67fd384c51be6080ef7ef8579b6a405d0d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | | | Doc: Fix the qhp project nameVenugopal Shivashankar2019-08-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1abdfe5d5 renamed the doc module without the version no. 2 in the name, but a bug was left behind. The qhp.project name was still called QtQuickControls2, while all the qhp settings in the qdocconf were using QtQuickControls. Task-number: QTBUG-77815 Change-Id: I1e8d10212798a1f4dfedcd7888f846e149851d23 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| * | | | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-08-241-1/+1
| |\ \ \ \
| | * | | | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-08-241-1/+1
| |/| | | | | | |/ / / | | | | | | | | | | Change-Id: Ib3ebf5d1ec84a9db722e7634d77bf424c37c52ce
| | * | / examples: type userto -> userAlbert Astals Cid2019-08-221-1/+1
| | | |/ | | |/| | | | | | | | | | | | | Change-Id: I99d9ea22fd51aa4e9da469b630b319ba71215558 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | | Doc: Replace the "Qt Quick Controls 2" instancesVenugopal Shivashankar2019-08-2259-229/+233
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that Controls 1 is deprecated, it's ideal to use "Qt Quick Controls" instead of "Qt Quick Controls 2". Task-number: QTBUG-70333 Change-Id: Ie745db4b61071ddb5e06150d4e739cda74c59f41 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| * | | TextEditor: Add modified handlingFriedemann Kleint2019-08-213-2/+39
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Add a modified property to the document and add handling in onClosing(). Connect the actions to call close() instead of Qt.quit() for it to become active. Change-Id: I0fec75629db64e91508ed8ba45d4fb60be146b1b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Fix deprecation warnings related to qmlRegisterType()Friedemann Kleint2019-09-052-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use qmlRegisterAnonymousType() instead of qmlRegisterType(), fixing: qtquicktemplates2plugin.cpp:176:54: warning: 'int qmlRegisterType() [with T = QQuickApplicationWindowAttached]' is deprecated: Use qmlRegisterAnonymousType instead [-Wdeprecated-declarations] qtquicktemplates2plugin.cpp:176:54: warning: 'int qmlRegisterType() [with T = QQuickApplicationWindowAttached]' is deprecated: Use qmlRegisterAnonymousType instead [-Wdeprecated-declarations] Change-Id: If5788a78643ad7148c33c4515396b074d20d62ab Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | | Register revision 3 for QQuickWindowQmlImpl into templatesUlf Hermann2019-08-291-1/+1
| | | | | | | | | | | | | | | | | | Fixes: QTBUG-77909 Change-Id: I87d41ab973ec5cb8a9cebcf0f22065e1bac221d8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-08-032-3/+42
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-08-032-3/+42
|/| | | | |/ / | | | | | | Change-Id: I629cb2b733de2e5533d8ba9f1665d14f542979b9
| * | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-07-302-3/+42
| |\ \
| | * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-302-3/+42
| |/| | | | |/ | | | | | | Change-Id: Ib1c507845cae7f354fe5a5fb9d71ee6963949bd0
| | * QQuickTextArea: prevent changing size of background recursivelyWang Chuan2019-07-242-3/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the x/y position of background depends on the height/width of background and these values are not constant, the if statement in the method resizeBackground() will always pass. And since a change listener is set before calling setHeight()/setWidth() in background, these two method will always call resizeBackground() and then call themself recursively, that means the height/width of background will always be reset, no matter what value you set. [ChangeLog][QtQuick][QQuickTextArea] defer adding change listener and prevent changing size of background recursively in construction Fixes: QTBUG-76369 Change-Id: I2ec37cad7f35cb1c756276326fe69e860c6b8de5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-07-272-23/+23
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-272-23/+23
|/| | | | |/ / | | | | | | Change-Id: Ic804e1279f39b1bc09f9d45b2b3415067854ec09
| * | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-07-232-23/+23
| |\ \
| | * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-232-23/+23
| |/| | | | |/ | | | | | | Change-Id: I8c038d287f066f2935ba0bceef5dd078704fd276
| | * Fix Flaky testsDimitrios Apostolou2019-07-222-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These tests where failing sometimes in our CI, because centerOnScreen() was invoked which asks the window manager to move the window, but does not wait for the event's completion. The solution is to do all that *before* the initial qWaitForWindowActive(). Fixes: QTBUG-73128 Change-Id: I06c1f85d5ff9657dccab50f29084f7624cd7e194 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | | Enable Material style with RHILaszlo Agocs2019-07-253-0/+29
| | | | | | | | | | | | | | | Change-Id: I9100d20b76b9cc6ac138f474e5d808db19ed6684 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Remove redundant codeVitaly Fanaskov2019-07-191-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reasons: 1) Qt::TexturePattern has never set by any code (this branch is unreachable); 2) There is no knowleage about any brushes in QML (this method is supposed to be invoked from QML only). Palette is used for colors only; 3) Even if brush style has been set somehow, it will be erased during palettes resolving process after assigning a new "window color". Looks like this code was copied from widgets styling and has been compiling only because of the current design. In light of redesigning palette class this code also makes no sense. Bringing knowledge about brushes and its styles to QML requires additional job. Change-Id: I555d062335593ad945b024136750dcd548cd9f16 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Nils Jeisecke <nils.jeisecke@saltation.com>
* | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-07-136-0/+100
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-136-0/+100
|/| | | | |/ / | | | | | | Change-Id: I76bfa11f39261e03b52ad237a09ff623bc865e0f
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 06:16:54 +0000