aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/quick/qquicktextinput
Commit message (Collapse)AuthorAgeFilesLines
* Correct license for test filesLucie Gérard2024-02-271-1/+1
| | | | | | | | | | | | | | According to QUIP-18 [1], all test files should be LicenseRef-Qt-Commercial OR GPL-3.0-only [1]: https://contribute.qt-project.org/quips/18 Pick-to: 6.7 Task-number: QTBUG-121787 Change-Id: I26d72e8de04d4c7c57b3b7838af5d033265de5ba Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Kai Köhne <kai.koehne@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Allow tapping to deselect in TextInput/TextField with pre-6.4 APIShawn Rutledge2023-11-071-0/+14
| | | | | | | | | Amends 650342de792e0ab37ce8bac8ccde21ab9b96b2c9 Fixes: QTBUG-116606 Pick-to: 6.5 6.6 Change-Id: I5c53559e0727c65a7d921a13f063ea2612cdcbca Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
* Remove remaining foreach in quick testsUlf Hermann2023-08-231-3/+1
| | | | | | | Task-number: QTBUG-115808 Change-Id: I30c27cf9972257897f15d57d62ff05ad1028b35e Reviewed-by: Sami Shalayel <sami.shalayel@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Mark the module as free of Q_FOREACH, except where it isn'tMarc Mutz2023-08-171-0/+3
| | | | | | | | | | | | | | | | | | | The density of Q_FOREACH uses is high here, too high for this author, unfamiliar with this code, to tackle in a short amount of time. But they're concentrated in just a few TUs, so pick a different strategy: Mark the whole module with QT_NO_FOREACH, to prevent new uses from creeping in, and whitelist the affected TUs by #undef'ing QT_NO_FOREACH locally, at the top of each file. For TUs that are part of a larger executable, this requires these files to be compiled separately, so add them to NO_PCH_SOURCES (which implies NO_UNITY_BUILD_SOURCES, too). Created QTBUG-115808 to keep track of this. Task-number: QTBUG-115808 Change-Id: I29c377f939e3d747e3ce72c224c4ee722df7a95d Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Normalize signal/slot signaturesMarc Mutz2023-07-121-1/+1
| | | | | | | | | | | | | | This is the result of running util/normalize on the code base. The following manual edits were needed: - skipped the hits in IS_SIGNAL_CONNECTED, which is using function pointers under the hood - restored the space before * in Q_SIGNAL void foo(QType *arg) Pick-to: 6.6 Change-Id: I299b3747c1aa2f6b3bc5ae1794edeb6fadfd75c6 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* CMake: Make quick tests standalone projectsAlexandru Croitor2023-07-051-0/+6
| | | | | | | | | | | | | | | | | Add the boilerplate standalone test prelude to each test, so that they can be opened with an IDE without the qt-cmake-standalone-test script, but directly with qt-cmake or cmake. Boilerplate was added using the follow script: https://git.qt.io/alcroito/cmake_refactor Manual adjustments were made where the code was inserted in the wrong location. Task-number: QTBUG-93020 Change-Id: I7854e7f015535a4835ce3daf816f7f33aa242c2a Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* tst_QQuickTextInput: Stabilize clipboard related functions on XCBAxel Spoerl2023-04-122-31/+13
| | | | | | | | | | | | | | | | | | Even if compiled with QT_CONFIG(clipboard), a functional clipboard might not be available on XCB (e.g. due to restrictions on CI VMs). This patch adds an explicit test for XCB to platformquirks_p.h. It skips the test functions canPaste() and canPasteEmpty(). As a drive-by it constifies local variables in canPaste() and middleClickPaste() and unifies the skip message. It also removes the BLACKLIST entries for clipboard-related tests on opensuse. Fixes: QTBUG-95940 Pick-to: 6.5 Change-Id: If6da9b589e98c1f63435f3d444567ce310ddee8a Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Retire the qt_parse_all_argumentsAmir Masoud Abdol2023-01-201-2/+2
| | | | | | Task-number: QTBUG-99238 Change-Id: Ia11c9cbd7c06347319ab3674ec0cd8da0214747e Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Android: Set EnterKeyNext as default type for TextInputBartlomiej Moskal2022-11-161-0/+32
| | | | | | | | | | | | | | | | | Behavior of EnterKey for virtual keyboard need to be changed for TextInput. Before this commit, ImeOption was set to IME_ACTION_DONE. Beacuse of that, setting any text in TextInput automatically accept QDialogs. That was annoying, when more than one QLineEdit need to be set. [ChangeLog][Quick][Android] EnterKey type is now changed from EnterKeyDefault to EnterKeyNext for virtual keyboard in TextInput. It is done only if the focus can be moved to QQuickItem below, so the activeFocusOnTab need to be set. Fixes: QTBUG-61652 Change-Id: Ib2faf78f4c85788498476c1e67e67d29d508cfea Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Port from container::count() and length() to size()Marc Mutz2022-10-071-263/+263
| | | | | | | | | | | | | | | | | | | | This is a semantic patch using ClangTidyTransformator as in qtbase/df9d882d41b741fef7c5beeddb0abe9d904443d8: auto QtContainerClass = anyOf( expr(hasType(cxxRecordDecl(isSameOrDerivedFrom(hasAnyName(classes))))).bind(o), expr(hasType(namedDecl(hasAnyName(<classes>)))).bind(o)); makeRule(cxxMemberCallExpr(on(QtContainerClass), callee(cxxMethodDecl(hasAnyName({"count", "length"), parameterCountIs(0))))), changeTo(cat(access(o, cat("size"), "()"))), cat("use 'size()' instead of 'count()/length()'")) a.k.a qt-port-to-std-compatible-api with config Scope: 'Container', with the extended set of container classes recognized. Change-Id: Idb1f75dfe2323bd1d9e8b4d58d54f1b4b80c7ed7 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Change the license of all CMakeLists.txt and *.cmake files to BSDLucie Gérard2022-09-071-1/+1
| | | | | | | Task-number: QTBUG-105718 Change-Id: Id89ed14990804a5024183e75382cc539d4293da1 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* CMake: Don't use PUBLIC_LIBRARIES for tests and test helpersAlexandru Croitor2022-07-281-2/+2
| | | | | Change-Id: I1cd769f85d5f82c43639d6787d98e536619249e6 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* TextInput/Field: selectByMouse default=true, but not on touchscreensShawn Rutledge2022-07-164-5/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When you drag a finger across a TextInput or TextField, it should not select text. - your finger probably covers several characters, so you can't see where you're selecting until afterwards - if the item is in a Flickable, flicking by touch should be prioritized - if flicking happens, the text cursor should not move; but to avoid losing too much functionality, we allow it to move on release, if the TextInput or TextField gets the release (i.e. if it still has the exclusive grab) - TextField's pressed, pressAndHold and released signals continue to behave the same with touch as with mouse So now we distinguish mouse events that are synthesized from non-mouse devices and avoid mouse-like behaviors as described above, but there is no behavior change if the event comes from an actual mouse or touchpad. Since most users want selecting text by mouse to "just work", and an actual mouse is precise enough to do so, and dragging a Flickable with the mouse is unintuitive (since most UIs don't allow it and most mice have wheels), selectByMouse now defaults to true, and has the stricter meaning that its name implies. To select text on a touchscreen, the end-user needs to rely on text-selection handles, which are provided on touch-centric mobile platforms, and could also be implemented from scratch if someone builds a custom text field using TextInput. [ChangeLog][QtQuick][TextInput] The selectByMouse property is now enabled by default, but no longer enables selecting by dragging your finger across text on a touchscreen. Platforms that are optimized for touchscreens normally use special text-selection handles, which interact with Qt via QInputMethod. You can opt out of the behavior change by using an import version < 6.4. [ChangeLog][Controls][TextField] The selectByMouse property is now enabled by default, but no longer enables selecting by dragging your finger across text on a touchscreen. Platforms that are optimized for touchscreens normally use special text-selection handles, which interact with Qt via QInputMethod. You can opt out of the behavior change by using an import version < 6.4. Pick-to: 6.4 Task-number: QTBUG-10684 Task-number: QTBUG-38934 Task-number: QTBUG-101205 Change-Id: I6d3158dd48896a0bed37cbc0b2da01d313a499f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Add license headers to cmake filesLucie Gérard2022-07-081-0/+3
| | | | | | | | | | | | CMakeLists.txt and .cmake files of significant size (more than 2 lines according to our check in tst_license.pl) now have the copyright and license header. Existing copyright statements remain intact Task-number: QTBUG-88621 Change-Id: I72c89a98c42bbc9234d8495e9e503bec81d11037 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Remove dead code in TextEdit/TextInput testsShawn Rutledge2022-06-211-20/+0
| | | | | | | | | It was distracting to have functions there with XXX comments, and no longer in use anyway. I don't see Carbon APIs in use either (egads). Pick-to: 6.4 Change-Id: I7e64deeb0b7df1ae0a3edb66e052aeb6beca23ef Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Use SPDX license identifiersLucie Gérard2022-06-111-27/+2
| | | | | | | | | | | | Replace the current license disclaimer in files by a SPDX-License-Identifier. Files that have to be modified by hand are modified. License files are organized under LICENSES directory. Pick-to: 6.4 Task-number: QTBUG-67283 Change-Id: I63563bbeb6f60f89d2c99660400dca7fab78a294 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Blacklist failing tests in tst_qquicktextinput on AndroidAndreas Buhr2022-05-061-0/+4
| | | | | | | | Pick-to: 6.2 6.3 Task-number: QTBUG-103256 Task-number: QTBUG-101865 Change-Id: Iaac2361ca9fa125c96c4aa7db72f19b663f66c94 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Fix tst_qquicktextinput on AndroidAndreas Buhr2022-04-254-7/+7
| | | | | | | | | | | | | | | | | | | | In tst_qquicktextinput a mouseclick at position 5 of the string "Hello World" was simulated. Then it was checked that the cursor position is not zero. However, on Android, the cursor is placed at the beginning of the word which is clicked. The visible cursor is still where the click was, but the whole word goes to the uncommited state and thus the program sees the cursor at the beginning of the word. As the click was in the first word, the cursor position becomes zero and the test fails. This patch changes the test to click in the third word of the string "Hello my wonderful world". Pick-to: 6.2 6.3 Task-number: QTBUG-101865 Change-Id: I70b241af1ecefe64fcfd7723f808e93f70bfe0b8 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Blacklist tst_qquicktextinput paste-related functionsUlf Hermann2022-03-231-0/+16
| | | | | | | Task-number: QTBUG-95940 Pick-to: 6.2 6.3 Change-Id: Iff569b1f20f441093b92f04d83f1b2a0514816ea Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Build tests without warnings after qtbase changesVolker Hilsheimer2022-03-181-11/+11
| | | | | | | | | | Replace deprecated QString::count with QString::size or QString::length, depending on context, and use qsizetype instead of int. Pick-to: 6.3 Change-Id: Ie4c08abd2cf2ba771c23e8def72756170cc07af7 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* Do not rely on transitive includes in testsFabian Kosmale2022-02-141-0/+1
| | | | | Change-Id: Icb68dbecab6f675352cd58333c82fa6648025367 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Stop using deprecated QMouseEvent and QContextMenuEvent ctorsShawn Rutledge2022-02-101-1/+2
| | | | | | | Needed after qtbase 6b2c9b81afdb3d1d9b7a2e87819e9545b14810f3 Change-Id: I117cd4d09b4219ddc97dd019419b4b971f9dbb8e Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Blacklist flaky qquicktextinput tests on openSuseFabian Kosmale2021-12-121-0/+8
| | | | | | Taks-number: QTBUG-99150 Change-Id: I445a0314c2f18472884740d911d2cb6f2e4ca9f4 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Set PopupFocusReason when focus moves because a popup opens or closesVolker Hilsheimer2021-12-041-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a popup opens and takes keyboard focus, then the control that had focus needs to get a focusOut event, with the reason set correctly. This allows text controls to stop blinking, but not deselecting text. So set the reason parameter to Qt::PopupFocusReason in all calls to functions that change focus in response to a QQuickPopup showing or hiding. However, QQuickItem partially ignored focus changes where the reason was set to Qt::PopupFocusReason. This seems to be a left-over from a fix for issues with Qt Quick Control 1 made in c860d33437c59a35d9d17ad199ce4f0f to make sure that menu entries are enabled and selection is not removed. The reason given here is no longer relevant: of course popups need to take focus, otherwise we can't navigate menus with the keyboard; and they do, at the latest the MenuItem takes focus away from the control breaking the entire assumption. And since prior to this change no code other than the outdated tst_qquicktextinput test passed focus with Qt::PopupFocusReason, we can safely assume that this logic is no longer needed. Controls that want to ignore a focusOut with PopupFocusReason can do so with this change. Note: PopupFocusReason in Qt Quick means any popup, including dialogs, while in QtWidgets it means a Qt::Popup type window. Since Quick dialogs don't trigger window activation changes and focusOut events with corresponding focus reasons, and since QtQuick has no concept equivalent to Qt::Popup where this could become confusing, this seems acceptable. Fixes: QTBUG-71723 Task-number: QTBUG-75862 Task-number: QTBUG-36332 Pick-to: 6.2 Change-Id: I7a0a29830d8f7ed80b22411785214758b896562c Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Consolidate test helpers into private librariesMitch Curtis2021-09-132-8/+6
| | | | | | | | | | | | | | | | | | | | Previously each test would include and build sources from the shared folder. Now we make those sources a library, build it once, then have each test link to it instead. We also take the opportunity to move some helpers that qtquickcontrols2 had added into the quicktestutils library where it makes sense, and for the helpers that don't make sense to be there, move them into quickcontrolstestutils. We add the libraries to src/ so that they are internal modules built as part of Qt, rather than tests. That way we can use them in a standalone test outside of qtdeclarative. Task-number: QTBUG-95621 Pick-to: 6.2 Change-Id: I0a2ab3976fdbff2e4414df7bdc0808f16453b80a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* qquicktextinput: Clear pre-edit text after input method resetJarkko Koivikko2021-08-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | The QPlatformInputContext::reset() function does not allow any further input method events to be called. Therefore, clearing the pre-edit text is the sole responsibility of the text input control. This change modifies the QQuickTextInputPrivate::resetInputMethod() function and calls QQuickTextInputPrivate::cancelPreedit() instead of QInputMethod::reset() directly. The cancelPreedit() function will send a QInputMethodEvent which clears the IM state (in addition of calling QInputMethod::reset() function). Also, rename the QQuickTextInputPrivate::resetInputMethod() function to cancelInput, since it does not call inputMethod()->reset() directly. Fixes: QTBUG-95461 Pick-to: 5.15 6.1 6.2 Change-Id: I6ab3b9dbe71956af72656e2a25a05d79603b34ea Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Inho Lee <inho.lee@qt.io> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> Reviewed-by: Jarkko Koivikko <jarkko.koivikko@code-q.fi>
* Fix override warningAndreas Buhr2021-07-281-1/+1
| | | | | Change-Id: Ice1f53472fe2e0c5ba20b2b33d7cb4bc0a39e26a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Pass the focus reason through to the control on mouse pressVolker Hilsheimer2021-07-232-0/+119
| | | | | | | | | | | | | | | | | Otherwise, a TextInput item will always receive OtherFocusReason when clicking into it. Add a test that simulates focus changes with mouse and keys, records the incoming focus events and verifies the correct focus reason is set in the event. Qt Quick provides no mechanism to access the focus reason from within QML (onActiveFocusChange only has a bool parameter, the focusReason property exists only in QtQuickControl). Task-number: QTBUG-75862 Pick-to: 6.2 6.1 5.15 Change-Id: Ifea95c7ef2ac88c6c8e8bbdc8d2dbe5205ff922e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* QQuickTextInput: update cursor rectangle after padding changedWang Chuan2021-04-162-0/+46
| | | | | | | | | | The position of cursor delegate needs to be updated when we change padding, otherwise it will be in a wrong position. Fixes: QTBUG-91867 Pick-to: 5.12 5.15 6.0 6.1 Change-Id: I89ca84fe893ebf517ab67890196eede14a4055d7 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Mark overrides in tests, fix compiler warningsVolker Hilsheimer2021-04-011-3/+3
| | | | | | Change-Id: If753558d911e50a73e351a93eed2e4df3e6592c7 Reviewed-by: David Skoland <david.skoland@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Remove the qmake project filesFabian Kosmale2021-01-151-16/+0
| | | | | | | | | Remove all qmake project files, except for examples which are used to test that qmake continues to work. Change-Id: Ic4abb72dc2dcd75df7a797c56056b6b3c5fe62ac Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Blacklist failing tests for QEMU ARMv7Samuli Piippo2021-01-071-0/+4
| | | | | | | | | QEMU has a bug that prevents fontconfig to work correctly, which causes font related testcase to fail. Blacklist those when running them in CI. Task-number: QTQAINFRA-4127 Change-Id: Id6970be0db49128fb46838dbec04bc6f26048761 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Refactor QQuickTextInput test to use QKeyCombinationVolker Hilsheimer2020-12-101-75/+35
| | | | | | | | | | Makes the code typesafe, simplifies the data structures, and fixes a compiler warning from implicit conversion from/to int. Pick-to: 6.0 Fixes: QTBUG-89356 Change-Id: I52d834811fa7325788fc71ea20f78b4afe3fdb86 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* tst_qquicktextinput: Do not construct illegal QCharFabian Kosmale2020-11-231-4/+17
| | | | | | | | | | | This change does the minimal amount of work to get the test to run without crashing due to triggering a QChar assert. Note that Key::toString does not check whether the QChar value it tries to construct is actually valid; but all values in the test case are. Fixes: QTBUG-88712 Change-Id: Ie484e66de46ad1d78573c31d90d40c99b8fd7caa Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Fix some compiler warnings in testsVolker Hilsheimer2020-10-261-10/+6
| | | | | | | | | | | Use char16_t instead of quint16 for arrays of 16bit strings. Use QKeyCombination API. As a drive-by, remove superfluous 0 from characters specified in hexadecimal. Change-Id: Ic52b1fdceaf3348a9b81c40814031e9c2e557dd9 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* CMake: Regenerate projects to use new qt_internal_ APIAlexandru Croitor2020-10-061-4/+4
| | | | | | | | Modify special case locations to use the new API as well. Task-number: QTBUG-86815 Change-Id: I3b964e3baf0cc7040830156dac30358ea1152801 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* Qt::KeyboardModifiers is not a pointer typeEdward Welbourne2020-07-271-4/+4
| | | | | | | | So initializing its members with nullptr Is Just Plain Wrong. This corrects commit 499ec43937e926e4f2fa57a9baa455fcb3862262 Change-Id: I6361f490eb4f5ff0161b399508b86361046bffe9 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Port the remaining tests from QRegExp to QRegularExpressionLars Knoll2020-04-031-6/+6
| | | | | Change-Id: If258701759c5da206948407feccd94e323af6b36 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Remove QRegExpValidator usagesLars Knoll2020-03-185-13/+13
| | | | | | | | | | | This also means the RegExpValidator QML type will be gone. Use QRegularExpressionValidator instead. [ChangeLog][QtQuick][RegExpValidator] The RegExpValidator QML type has been removed. Use RegularExpressionValidator instead. Change-Id: If25fc5a258a669dfd28e705271757caa252ce05c Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* CMake: Update Apple platform defines after rename in qtbaseTor Arne Vestbø2020-03-171-3/+3
| | | | | Change-Id: Ia0a075e3199eab735f9b289873beeb8730ebc47e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2020-03-121-0/+4
|\ | | | | | | | | | | | | | | Conflicts: dependencies.yaml src/qml/qml/qqmlengine.cpp Change-Id: I6a73fd1064286f4a2232de85c2ce7f80452d4641
| * Blacklist tst_QQuickTextInput::setInputMask() on macOsFabian Kosmale2020-02-121-0/+4
| | | | | | | | | | | | Task-number: QTBUG-82058 Change-Id: Ida2a546044d4c85f3ec8037ff7e8f1fd2bd1f424 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | Regenerate qtdeclarativeAlexandru Croitor2020-02-121-5/+2
| | | | | | | | | | | | | | Change-Id: I48d7fd306f3d1b161a8e73029282ee591b1ef612 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Merge remote-tracking branch 'origin/dev' into wip/cmakeLeander Beernaert2020-01-161-23/+44
|\| | | | | | | Change-Id: I0c5b939c70bdb91ccdf7068784308416dcaa5736
| * QQuickTextInput: Fix validators testUlf Hermann2019-12-111-19/+23
| | | | | | | | | | | | | | | | | | | | | | | | The behavior of QDoubleValidator has changed in qtbase, in commit 3359b29c99581f52acf033489ad35884a01ccac8. "12," is not an acceptable input anymore. Adapt the test to reflect this. Change-Id: I0daaae2f84325b911263ee0545523ce3cc322049 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Andy Shaw <andy.shaw@qt.io>
| * Make inputmask 'X' mask character require non-blank inputEirik Aavitsland2019-12-101-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The implementation for the X mask would accept any printable character. Since that includes the blank character, there was no difference in behavior between the requiring X and optional x: both would allow the input to be unset, i.e. blank. This change should be seen in conjunction with the doc improvement qtbase:da0af1e and the corresponding change to the QLineEdit widget, where the same input mask handling code is duplicated. This patch series also concludes the old task questioning whether text() should strip blanks even when they are valid input (answer: yes, continue to do that), and so a couple of XFAILS was removed from the autotest. [ChangeLog][QtQuick][TextInput] Inputmask X character now requires non-blank input. Task-number: QTBUG-76320 Change-Id: I606ae04259f29f748b3ce604048c6eb6f10c2ff9 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
| * Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-041-0/+8
| |\ | | | | | | | | | Change-Id: I4e4464d785c8c4a0d06ffaaff3e1cdd94e1c179a
| | * Do not emit inputMaskChanged when setting the same input maskJan Arve Sæther2019-12-021-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you did not specify a blank character (e.g. "; " as suffix) it would internally add that suffix to the property, resulting in that the property itself actually got a "; " suffix even when not specified. So when setting the same input mask again, it wouldn't match the existing inputMask property, and it would emit inputMaskChanged again. Change-Id: Ia47d63d56c640b4be9d6d0a704ddfaff01befbdb Fixes: QTBUG-80190 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | | Merge remote-tracking branch 'origin/dev' into wip/cmakeLeander Beernaert2019-11-252-6/+58
|\| | | | | | | | | | | Change-Id: I48b9c2e4f3a75c18470c55f73f2089dc1401de54
| * | Handle -no-feature-shortcutFriedemann Kleint2019-10-181-6/+23
| |/ | | | | | | | | | | | | | | | | | | | | | | | | Preparing for the extraction of QGuiShortcut, the shortcut feature will changed to follow the convention of using QT_REQUIRE_CONFIG(shortcut) in the affected class headers. Add the required exclusions to prevent compile errors when disabling shortcuts. Task-number: QTBUG-76493 Change-Id: Icad95584ae12aa97a56b56ef27206cef1b1ba48f Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 17:43:08 +0000