diff options
Diffstat (limited to 'tests/auto/quick/qquicktext')
| -rw-r--r-- | tests/auto/quick/qquicktext/BLACKLIST | 1 | ||||
| -rw-r--r-- | tests/auto/quick/qquicktext/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | tests/auto/quick/qquicktext/data/elideZeroWidthWithMargins.qml | 27 | ||||
| -rw-r--r-- | tests/auto/quick/qquicktext/data/lineLayout.qml | 2 | ||||
| -rw-r--r-- | tests/auto/quick/qquicktext/data/lineLayoutFontUpdate.qml | 25 | ||||
| -rw-r--r-- | tests/auto/quick/qquicktext/data/lineLayoutImplicitWidth.qml | 4 | ||||
| -rw-r--r-- | tests/auto/quick/qquicktext/data/lineLayoutRelayout.qml | 2 | ||||
| -rw-r--r-- | tests/auto/quick/qquicktext/data/loaderActiveOnVisible.qml | 24 | ||||
| -rw-r--r-- | tests/auto/quick/qquicktext/data/long.qml | 7 | ||||
| -rw-r--r-- | tests/auto/quick/qquicktext/data/qtbug_106205.qml | 28 | ||||
| -rw-r--r-- | tests/auto/quick/qquicktext/data/tarzeau_ocr_a.ttf | bin | 0 -> 24544 bytes | |||
| -rw-r--r-- | tests/auto/quick/qquicktext/tst_qquicktext.cpp | 508 |
12 files changed, 402 insertions, 232 deletions
diff --git a/tests/auto/quick/qquicktext/BLACKLIST b/tests/auto/quick/qquicktext/BLACKLIST index a4e9c44eab..46936293ca 100644 --- a/tests/auto/quick/qquicktext/BLACKLIST +++ b/tests/auto/quick/qquicktext/BLACKLIST @@ -3,6 +3,7 @@ opensuse-42.1 [contentSize] windows gcc msvc-2019 +msvc-2022 [hAlignVisual] sles # QTQAINFRA-4127 diff --git a/tests/auto/quick/qquicktext/CMakeLists.txt b/tests/auto/quick/qquicktext/CMakeLists.txt index b4f2bae534..68330befd9 100644 --- a/tests/auto/quick/qquicktext/CMakeLists.txt +++ b/tests/auto/quick/qquicktext/CMakeLists.txt @@ -7,6 +7,12 @@ ## tst_qquicktext Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qquicktext LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + # Collect test data file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} diff --git a/tests/auto/quick/qquicktext/data/elideZeroWidthWithMargins.qml b/tests/auto/quick/qquicktext/data/elideZeroWidthWithMargins.qml new file mode 100644 index 0000000000..bb269e6ad5 --- /dev/null +++ b/tests/auto/quick/qquicktext/data/elideZeroWidthWithMargins.qml @@ -0,0 +1,27 @@ +import QtQuick + +Item { + id: root + property bool ok: false + width: 640 + height: 480 + + Text { + id: text + text: "This is a quite long text. Click me and i should remain visible!!! Sadly this doesn't happen" + elide: Text.ElideRight + anchors { + fill: parent + margins: 1 + } + } + + Component.onCompleted: { + text.width = 300; + text.height = 0; + text.width = 0; + text.height = 30; + text.width = 300; + root.ok = text.paintedWidth > 0 && text.paintedHeight > 0 + } +} diff --git a/tests/auto/quick/qquicktext/data/lineLayout.qml b/tests/auto/quick/qquicktext/data/lineLayout.qml index 5a980de7da..74b9ecb500 100644 --- a/tests/auto/quick/qquicktext/data/lineLayout.qml +++ b/tests/auto/quick/qquicktext/data/lineLayout.qml @@ -20,7 +20,7 @@ Rectangle { text: "<b>Lorem ipsum</b> dolor sit amet, consectetur adipiscing elit. Integer at ante dui. Sed eu egestas est. <br/><p><i>Maecenas nec libero leo. Sed ac leo eget ipsum ultricies viverra sit amet eu orci. Praesent et tortor risus, viverra accumsan sapien. Sed faucibus eleifend lectus, sed euismod urna porta eu. Aenean ultricies lectus ut orci dictum quis convallis nisi ultrices. Nunc elit mi, iaculis a porttitor rutrum, venenatis malesuada nisi. Suspendisse turpis quam, euismod non imperdiet et, rutrum nec ligula. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam semper tristique metus eu sodales. Integer eget risus ipsum. Quisque ut risus ut nulla tristique volutpat at sit amet nisl. Aliquam pulvinar auctor diam nec bibendum.</i><br/><p>Quisque luctus sapien id arcu volutpat pharetra. Praesent pretium imperdiet euismod. Integer fringilla rhoncus condimentum. Quisque sit amet ornare nulla. Cras sapien augue, sagittis a dictum id, suscipit et nunc. Cras vitae augue in enim elementum venenatis sed nec risus. Sed nisi quam, mollis quis auctor ac, vestibulum in neque. Vivamus eu justo risus. Suspendisse vel mollis est. Vestibulum gravida interdum mi, in molestie neque gravida in. Donec nibh odio, mattis facilisis vulputate et, scelerisque ut felis. Sed ornare eros nec odio aliquam eu varius augue adipiscing. Vivamus sit amet massa dapibus sapien pulvinar consectetur a sit amet felis. Cras non mi id libero dictum iaculis id dignissim eros. Praesent eget enim dui, sed bibendum neque. Ut interdum nisl id leo malesuada ornare. Pellentesque id nisl eu odio volutpat posuere et at massa. Pellentesque nec lorem justo. Integer sem urna, pharetra sed sagittis vitae, condimentum ac felis. Ut vitae sapien ac tortor adipiscing pharetra. Cras tristique urna tempus ante volutpat eleifend non eu ligula. Mauris sodales nisl et lorem tristique sodales. Mauris arcu orci, vehicula semper cursus ac, dapibus ut mi." - onLineLaidOut: { + onLineLaidOut: (line) => { line.width = line.number * 15 if (line.number === 30 || line.number === 60) { main.off = line.y diff --git a/tests/auto/quick/qquicktext/data/lineLayoutFontUpdate.qml b/tests/auto/quick/qquicktext/data/lineLayoutFontUpdate.qml new file mode 100644 index 0000000000..d018e31d29 --- /dev/null +++ b/tests/auto/quick/qquicktext/data/lineLayoutFontUpdate.qml @@ -0,0 +1,25 @@ +import QtQuick + +Item { + width: 640 + height: 480 + + FontLoader { + id: fontIcons + source: "tarzeau_ocr_a.ttf" + } + + Text { + id: exampleText + objectName: "exampleText" + text: "Example multiline text" + wrapMode: Text.WordWrap + width: 100 + onLineLaidOut: (line) => { + if (line.number < 1) { + line.x += 40; + line.width -= 40; + } + } + } +} diff --git a/tests/auto/quick/qquicktext/data/lineLayoutImplicitWidth.qml b/tests/auto/quick/qquicktext/data/lineLayoutImplicitWidth.qml index 0b04028417..94a6ac2797 100644 --- a/tests/auto/quick/qquicktext/data/lineLayoutImplicitWidth.qml +++ b/tests/auto/quick/qquicktext/data/lineLayoutImplicitWidth.qml @@ -1,5 +1,5 @@ // Copyright (C) 2019 Jolla Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import QtQuick 2.0 @@ -23,7 +23,7 @@ Rectangle { text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam quis ante tristique, fermentum magna at, varius lacus. Donec elementum orci sit amet ligula efficitur, eget sodales orci porttitor. Etiam laoreet tellus quis nisi mollis lacinia. Cras vitae nisl sed nunc semper blandit. Duis egestas commodo lacus non congue. Fusce quis rhoncus urna. And magna arcu, sodales vitae nunc vel, rutrum hendrerit magna. Nullam imperdiet porttitor sem at euismod. Morbi faucibus libero sit amet vestibulum aliquam. Duis consectetur lacinia malesuada. Sed quis ante dui. Name dignissim faucibus felis. Quisque dapibus aliquam ante, eu cursus elit dictum in. Mauris placerat efficitur rutrum." - onLineLaidOut: { + onLineLaidOut: (line) => { var n = line.number // Save information about the line so the autotest can retrieve it diff --git a/tests/auto/quick/qquicktext/data/lineLayoutRelayout.qml b/tests/auto/quick/qquicktext/data/lineLayoutRelayout.qml index 2e1aa6a17d..2f46159602 100644 --- a/tests/auto/quick/qquicktext/data/lineLayoutRelayout.qml +++ b/tests/auto/quick/qquicktext/data/lineLayoutRelayout.qml @@ -29,7 +29,7 @@ leo eget ipsum ultricies viverra sit amet eu orci. Praesent et tortor risus, viverra accumsan sapien. Sed faucibus eleifend lectus, sed euismod urna porta eu. Quisque vitae accumsan lectus." - onLineLaidOut: { + onLineLaidOut: (line) => { line.width = width / 2 if (line.y + line.height >= height) { diff --git a/tests/auto/quick/qquicktext/data/loaderActiveOnVisible.qml b/tests/auto/quick/qquicktext/data/loaderActiveOnVisible.qml new file mode 100644 index 0000000000..915dc21d84 --- /dev/null +++ b/tests/auto/quick/qquicktext/data/loaderActiveOnVisible.qml @@ -0,0 +1,24 @@ +import QtQuick + +Rectangle { + id: root + visible: false + width: 320 + height: 240 + Flickable { + id: flickable + anchors { + fill: root + margins: 10 + } + contentHeight: loader.height + + Loader { + id: loader + width: flickable.width + active: root.visible + source: "long.qml" + } + } + Component.onCompleted: visible = true +} diff --git a/tests/auto/quick/qquicktext/data/long.qml b/tests/auto/quick/qquicktext/data/long.qml new file mode 100644 index 0000000000..ca27efb35a --- /dev/null +++ b/tests/auto/quick/qquicktext/data/long.qml @@ -0,0 +1,7 @@ +import QtQuick + +Text { + width: 300 + wrapMode: Text.WordWrap + text: "GNU GENERAL PUBLIC LICENSE\r\nVersion 2, June 1991\r\nCopyright (C) 1989, 1991 Free Software Foundation, Inc.\r\n51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA\r\n\r\nEveryone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.\r\n\r\nPreamble\r\n\r\nThe licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too.\r\n\r\nWhen we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.\r\n\r\nTo protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.\r\n\r\nFor example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.\r\n\r\nWe protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and\/or modify the software.\r\n\r\nAlso, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations.\r\n\r\nFinally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all.\r\n\r\nThe precise terms and conditions for copying, distribution and modification follow.\r\n\r\nTERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\r\n\r\n1. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The \"Program\", below, refers to any such program or work, and a \"work based on the Program\" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and\/or translated into another language. (Hereinafter, translation is included without limitation in the term \"modification\".) Each licensee is addressed as \"you\".\r\n\r\nActivities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.\r\n\r\n2. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.\r\n\r\nYou may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.\r\n\r\n3. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:\r\n\r\na) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.\r\n\r\nb) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.\r\n\r\nc) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.)\r\n\r\nThese requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.\r\n\r\nThus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.\r\n\r\nIn addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.\r\n\r\n4. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:\r\n\r\na) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,\r\n\r\nb) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,\r\n\r\nc) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.)\r\n\r\nThe source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.\r\n\r\nIf distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.\r\n\r\n5. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.\r\n\r\n6. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.\r\n\r\n7. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.\r\n\r\n8. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.\r\n\r\nIf any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.\r\n\r\nIt is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author\/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.\r\n\r\nThis section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.\r\n\r\n9. If the distribution and\/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.\r\n\r\n10. The Free Software Foundation may publish revised and\/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.\r\n\r\nEach version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and \"any later version\", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.\r\n\r\n11. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.\r\n\r\nNO WARRANTY\r\n\r\n12. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND\/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.\r\n\r\n13. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND\/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.\r\nEND OF TERMS AND CONDITIONS\r\n\r\n" +} diff --git a/tests/auto/quick/qquicktext/data/qtbug_106205.qml b/tests/auto/quick/qquicktext/data/qtbug_106205.qml new file mode 100644 index 0000000000..e4db73557a --- /dev/null +++ b/tests/auto/quick/qquicktext/data/qtbug_106205.qml @@ -0,0 +1,28 @@ +import QtQuick +import QtQuick.Controls + +Item { + id: root + objectName: "root" + visible: true + + anchors.fill: parent + property string text: "" + + ScrollView { + anchors.fill: parent + Rectangle { + x: 100 + width: 100 + height: 30 + color: "lightgray" + + Text { + objectName: "textOutsideViewport" + text: root.text + width: 50 + clip: true + } + } + } +} diff --git a/tests/auto/quick/qquicktext/data/tarzeau_ocr_a.ttf b/tests/auto/quick/qquicktext/data/tarzeau_ocr_a.ttf Binary files differnew file mode 100644 index 0000000000..cf93f9651f --- /dev/null +++ b/tests/auto/quick/qquicktext/data/tarzeau_ocr_a.ttf diff --git a/tests/auto/quick/qquicktext/tst_qquicktext.cpp b/tests/auto/quick/qquicktext/tst_qquicktext.cpp index c8d9561803..b731f1b069 100644 --- a/tests/auto/quick/qquicktext/tst_qquicktext.cpp +++ b/tests/auto/quick/qquicktext/tst_qquicktext.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <qtest.h> #include <QtTest/QSignalSpy> #include <QTextDocument> @@ -7,11 +7,12 @@ #include <QtQml/qqmlcomponent.h> #include <QtQml/qjsvalue.h> #include <QtQuick/private/qquicktext_p.h> +#include <QtQuick/private/qquickflickable_p.h> #include <QtQuick/private/qquickmousearea_p.h> +#include <QtQuick/private/qquickpixmapcache_p.h> #include <QtQuickTest/QtQuickTest> #include <private/qquicktext_p_p.h> -#include <private/qquicktextnode_p.h> -#include <private/qquicktextdocument_p.h> +#include <private/qsginternaltextnode_p.h> #include <private/qquickvaluetypes_p.h> #include <QFontMetrics> #include <qmath.h> @@ -28,12 +29,17 @@ DEFINE_BOOL_CONFIG_OPTION(qmlDisableDistanceField, QML_DISABLE_DISTANCEFIELD) Q_DECLARE_METATYPE(QQuickText::TextFormat) -QT_BEGIN_NAMESPACE -extern void qt_setQtEnableTestFont(bool value); -QT_END_NAMESPACE +typedef QVector<QPointF> PointVector; +Q_DECLARE_METATYPE(PointVector); + +typedef qreal (*ExpectedBaseline)(QQuickText *item); +Q_DECLARE_METATYPE(ExpectedBaseline) Q_LOGGING_CATEGORY(lcTests, "qt.quick.tests") +QT_BEGIN_NAMESPACE +extern void qt_setQtEnableTestFont(bool value); + class tst_qquicktext : public QQmlDataTest { Q_OBJECT @@ -47,12 +53,14 @@ private slots: void wrap(); void elide(); void elideParentChanged(); + void elideRelayoutAfterZeroWidth_data(); void elideRelayoutAfterZeroWidth(); void multilineElide_data(); void multilineElide(); void implicitElide_data(); void implicitElide(); void textFormat(); + void clipRectOutsideViewportDynamicallyChanged(); void baseUrl(); void embeddedImages_data(); @@ -100,8 +108,10 @@ private slots: void clipRect(); void largeTextObservesViewport_data(); void largeTextObservesViewport(); + void largeTextInDelayedLoader(); void lineLaidOut(); void lineLaidOutRelayout(); + void lineLaidOutFontUpdate(); void lineLaidOutHAlign(); void lineLaidOutImplicitWidth(); @@ -248,13 +258,12 @@ void tst_qquicktext::text() { QQmlComponent textComponent(&engine); textComponent.setData("import QtQuick 2.0\nText { text: \"\" }", QUrl::fromLocalFile("")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); QVERIFY(textObject != nullptr); QCOMPARE(textObject->text(), QString("")); QCOMPARE(textObject->width(), qreal(0)); - - delete textObject; } for (int i = 0; i < standard.size(); i++) @@ -262,14 +271,12 @@ void tst_qquicktext::text() QString componentStr = "import QtQuick 2.0\nText { text: \"" + standard.at(i) + "\" }"; QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); - - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); QVERIFY(textObject != nullptr); QCOMPARE(textObject->text(), standard.at(i)); QVERIFY(textObject->width() > 0); - - delete textObject; } for (int i = 0; i < richText.size(); i++) @@ -277,14 +284,13 @@ void tst_qquicktext::text() QString componentStr = "import QtQuick 2.0\nText { text: \"" + richText.at(i) + "\" }"; QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); QVERIFY(textObject != nullptr); QString expected = richText.at(i); QCOMPARE(textObject->text(), expected.replace("\\\"", "\"")); QVERIFY(textObject->width() > 0); - - delete textObject; } } @@ -294,12 +300,11 @@ void tst_qquicktext::width() { QQmlComponent textComponent(&engine); textComponent.setData("import QtQuick 2.0\nText { text: \"\" }", QUrl::fromLocalFile("")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); QVERIFY(textObject != nullptr); QCOMPARE(textObject->width(), 0.); - - delete textObject; } bool requiresUnhintedMetrics = !qmlDisableDistanceField(); @@ -341,14 +346,13 @@ void tst_qquicktext::width() QString componentStr = "import QtQuick 2.0\nText { text: \"" + standard.at(i) + "\" }"; QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); QVERIFY(textObject != nullptr); QVERIFY(textObject->boundingRect().width() > 0); QCOMPARE(textObject->width(), qreal(metricWidth)); QVERIFY(textObject->textFormat() == QQuickText::AutoText); // setting text doesn't change format - - delete textObject; } for (int i = 0; i < richText.size(); i++) @@ -358,7 +362,8 @@ void tst_qquicktext::width() QString componentStr = "import QtQuick 2.0\nText { text: \"" + richText.at(i) + "\"; textFormat: Text.RichText }"; QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); QVERIFY(textObject != nullptr); QQuickTextPrivate *textPrivate = QQuickTextPrivate::get(textObject); @@ -370,8 +375,6 @@ void tst_qquicktext::width() QCOMPARE(int(textObject->width()), int(doc->idealWidth())); QCOMPARE(textObject->textFormat(), QQuickText::RichText); - - delete textObject; } } @@ -382,14 +385,13 @@ void tst_qquicktext::wrap() { QQmlComponent textComponent(&engine); textComponent.setData("import QtQuick 2.0\nText { text: \"Hello\"; wrapMode: Text.WordWrap; width: 300 }", QUrl::fromLocalFile("")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); + QVERIFY2(textObject != nullptr, qPrintable(textComponent.errorString())); textHeight = textObject->height(); - QVERIFY(textObject != nullptr); QCOMPARE(textObject->wrapMode(), QQuickText::WordWrap); QCOMPARE(textObject->width(), 300.); - - delete textObject; } for (int i = 0; i < standard.size(); i++) @@ -397,7 +399,8 @@ void tst_qquicktext::wrap() QString componentStr = "import QtQuick 2.0\nText { wrapMode: Text.WordWrap; width: 30; text: \"" + standard.at(i) + "\" }"; QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); QVERIFY(textObject != nullptr); QCOMPARE(textObject->width(), 30.); @@ -406,8 +409,6 @@ void tst_qquicktext::wrap() int oldHeight = textObject->height(); textObject->setWidth(100); QVERIFY(textObject->height() < oldHeight); - - delete textObject; } for (int i = 0; i < richText.size(); i++) @@ -415,7 +416,8 @@ void tst_qquicktext::wrap() QString componentStr = "import QtQuick 2.0\nText { wrapMode: Text.WordWrap; width: 30; text: \"" + richText.at(i) + "\" }"; QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); QVERIFY(textObject != nullptr); QCOMPARE(textObject->width(), 30.); @@ -424,8 +426,6 @@ void tst_qquicktext::wrap() qreal oldHeight = textObject->height(); textObject->setWidth(100); QVERIFY(textObject->height() < oldHeight); - - delete textObject; } // Check that increasing width from idealWidth will cause a relayout @@ -434,7 +434,8 @@ void tst_qquicktext::wrap() QString componentStr = "import QtQuick 2.0\nText { wrapMode: Text.WordWrap; textFormat: Text.RichText; width: 30; text: \"" + richText.at(i) + "\" }"; QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); QVERIFY(textObject != nullptr); QCOMPARE(textObject->width(), 30.); @@ -453,8 +454,6 @@ void tst_qquicktext::wrap() qreal oldHeight = textObject->height(); textObject->setWidth(100); QVERIFY(textObject->height() < oldHeight); - - delete textObject; } // richtext again with a fixed height @@ -463,7 +462,8 @@ void tst_qquicktext::wrap() QString componentStr = "import QtQuick 2.0\nText { wrapMode: Text.WordWrap; width: 30; height: 50; text: \"" + richText.at(i) + "\" }"; QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); QVERIFY(textObject != nullptr); QCOMPARE(textObject->width(), 30.); @@ -472,8 +472,6 @@ void tst_qquicktext::wrap() qreal oldHeight = textObject->implicitHeight(); textObject->setWidth(100); QVERIFY(textObject->implicitHeight() < oldHeight); - - delete textObject; } { @@ -511,12 +509,12 @@ void tst_qquicktext::elide() { QQmlComponent textComponent(&engine); textComponent.setData(("import QtQuick 2.0\nText { text: \"\"; "+elide+" width: 100 }").toLatin1(), QUrl::fromLocalFile("")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); + QVERIFY2(textObject, qPrintable(textComponent.errorString())); QCOMPARE(textObject->elideMode(), m); QCOMPARE(textObject->width(), 100.); - - delete textObject; } for (int i = 0; i < standard.size(); i++) @@ -524,15 +522,15 @@ void tst_qquicktext::elide() QString componentStr = "import QtQuick 2.0\nText { "+elide+" width: 100; text: \"" + standard.at(i) + "\" }"; QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); + QVERIFY2(textObject, qPrintable(textComponent.errorString())); QCOMPARE(textObject->elideMode(), m); QCOMPARE(textObject->width(), 100.); if (m != QQuickText::ElideNone && !standard.at(i).contains('\n')) QVERIFY(textObject->contentWidth() <= textObject->width()); - - delete textObject; } for (int i = 0; i < richText.size(); i++) @@ -540,15 +538,15 @@ void tst_qquicktext::elide() QString componentStr = "import QtQuick 2.0\nText { "+elide+" width: 100; text: \"" + richText.at(i) + "\" }"; QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); + QVERIFY2(textObject, qPrintable(textComponent.errorString())); QCOMPARE(textObject->elideMode(), m); QCOMPARE(textObject->width(), 100.); if (m != QQuickText::ElideNone && standard.at(i).contains("<br>")) QVERIFY(textObject->contentWidth() <= textObject->width()); - - delete textObject; } } } @@ -592,10 +590,19 @@ void tst_qquicktext::elideParentChanged() QCOMPARE(actualItemImageGrab, expectedItemImageGrab); } +void tst_qquicktext::elideRelayoutAfterZeroWidth_data() +{ + QTest::addColumn<QByteArray>("fileName"); + + QTest::newRow("no_margins") << QByteArray("elideZeroWidth.qml"); + QTest::newRow("with_margins") << QByteArray("elideZeroWidthWithMargins.qml"); +} + void tst_qquicktext::elideRelayoutAfterZeroWidth() { + QFETCH(const QByteArray, fileName); QQmlEngine engine; - QQmlComponent component(&engine, testFileUrl("elideZeroWidth.qml")); + QQmlComponent component(&engine, testFileUrl(fileName.constData())); QScopedPointer<QObject> root(component.create()); QVERIFY2(root, qPrintable(component.errorString())); QVERIFY(root->property("ok").toBool()); @@ -699,6 +706,7 @@ void tst_qquicktext::implicitElide() textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QVERIFY2(textObject, qPrintable(textComponent.errorString())); QVERIFY(textObject->contentWidth() <= textObject->width()); textObject->setText("the quick brown fox jumped over"); @@ -712,7 +720,8 @@ void tst_qquicktext::textFormat() { QQmlComponent textComponent(&engine); textComponent.setData("import QtQuick 2.0\nText { text: \"Hello\"; textFormat: Text.RichText }", QUrl::fromLocalFile("")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); QVERIFY(textObject != nullptr); QCOMPARE(textObject->textFormat(), QQuickText::RichText); @@ -720,13 +729,12 @@ void tst_qquicktext::textFormat() QQuickTextPrivate *textPrivate = QQuickTextPrivate::get(textObject); QVERIFY(textPrivate != nullptr); QVERIFY(textPrivate->richText); - - delete textObject; } { QQmlComponent textComponent(&engine); textComponent.setData("import QtQuick 2.0\nText { text: \"<b>Hello</b>\" }", QUrl::fromLocalFile("")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); QVERIFY(textObject != nullptr); QCOMPARE(textObject->textFormat(), QQuickText::AutoText); @@ -734,18 +742,15 @@ void tst_qquicktext::textFormat() QQuickTextPrivate *textPrivate = QQuickTextPrivate::get(textObject); QVERIFY(textPrivate != nullptr); QVERIFY(textPrivate->styledText); - - delete textObject; } { QQmlComponent textComponent(&engine); textComponent.setData("import QtQuick 2.0\nText { text: \"<b>Hello</b>\"; textFormat: Text.PlainText }", QUrl::fromLocalFile("")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); QVERIFY(textObject != nullptr); QCOMPARE(textObject->textFormat(), QQuickText::PlainText); - - delete textObject; } { @@ -827,6 +832,28 @@ void tst_qquicktext::textFormat() } } +void tst_qquicktext::clipRectOutsideViewportDynamicallyChanged() +{ + // QTBUG-106205 + QScopedPointer<QQuickView> view(createView(testFile("qtbug_106205.qml"))); + view->setWidth(100); + view->setHeight(200); + view->showNormal(); + QQuickItem *root = view->rootObject(); + QVERIFY(root); + QVERIFY(QTest::qWaitForWindowExposed(view.get())); + + auto clipRectMatches = [&]() -> bool { + auto *textOutsideInitialViewport = root->findChild<QQuickText *>("textOutsideViewport"); + if (!textOutsideInitialViewport) + return false; + auto *clipNode = QQuickItemPrivate::get(textOutsideInitialViewport)->clipNode(); + + return textOutsideInitialViewport->clipRect() == clipNode->clipRect(); + }; + QTRY_VERIFY(clipRectMatches()); +} + //the alignment tests may be trivial o.oa void tst_qquicktext::horizontalAlignment() { @@ -839,11 +866,11 @@ void tst_qquicktext::horizontalAlignment() QString componentStr = "import QtQuick 2.0\nText { horizontalAlignment: \"" + horizontalAlignmentmentStrings.at(j) + "\"; text: \"" + standard.at(i) + "\" }"; QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); + QVERIFY2(textObject, qPrintable(textComponent.errorString())); QCOMPARE((int)textObject->hAlign(), (int)horizontalAlignmentments.at(j)); - - delete textObject; } } @@ -854,11 +881,11 @@ void tst_qquicktext::horizontalAlignment() QString componentStr = "import QtQuick 2.0\nText { horizontalAlignment: \"" + horizontalAlignmentmentStrings.at(j) + "\"; text: \"" + richText.at(i) + "\" }"; QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); + QVERIFY2(textObject, qPrintable(textComponent.errorString())); QCOMPARE((int)textObject->hAlign(), (int)horizontalAlignmentments.at(j)); - - delete textObject; } } @@ -975,10 +1002,11 @@ void tst_qquicktext::horizontalAlignment_RightToLeft() QString componentStr = "import QtQuick 2.0\nText {}"; QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); + QVERIFY2(textObject, qPrintable(textComponent.errorString())); QCOMPARE(textObject->hAlign(), qApp->inputMethod()->inputDirection() == Qt::LeftToRight ? QQuickText::AlignLeft : QQuickText::AlignRight); - delete textObject; } int tst_qquicktext::numberOfNonWhitePixels(int fromX, int toX, const QImage &image) @@ -1076,12 +1104,11 @@ void tst_qquicktext::verticalAlignment() QString componentStr = "import QtQuick 2.0\nText { verticalAlignment: \"" + verticalAlignmentmentStrings.at(j) + "\"; text: \"" + standard.at(i) + "\" }"; QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); QVERIFY(textObject != nullptr); QCOMPARE((int)textObject->vAlign(), (int)verticalAlignmentments.at(j)); - - delete textObject; } } @@ -1092,12 +1119,11 @@ void tst_qquicktext::verticalAlignment() QString componentStr = "import QtQuick 2.0\nText { verticalAlignment: \"" + verticalAlignmentmentStrings.at(j) + "\"; text: \"" + richText.at(i) + "\" }"; QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); QVERIFY(textObject != nullptr); QCOMPARE((int)textObject->vAlign(), (int)verticalAlignmentments.at(j)); - - delete textObject; } } @@ -1110,74 +1136,74 @@ void tst_qquicktext::font() QString componentStr = "import QtQuick 2.0\nText { font.pointSize: 40; text: \"Hello World\" }"; QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); + QVERIFY2(textObject != nullptr, qPrintable(textComponent.errorString())); QCOMPARE(textObject->font().pointSize(), 40); QCOMPARE(textObject->font().bold(), false); QCOMPARE(textObject->font().italic(), false); - - delete textObject; } { QString componentStr = "import QtQuick 2.0\nText { font.pixelSize: 40; text: \"Hello World\" }"; QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); + QVERIFY2(textObject != nullptr, qPrintable(textComponent.errorString())); QCOMPARE(textObject->font().pixelSize(), 40); QCOMPARE(textObject->font().bold(), false); QCOMPARE(textObject->font().italic(), false); - - delete textObject; } { QString componentStr = "import QtQuick 2.0\nText { font.bold: true; text: \"Hello World\" }"; QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); + QVERIFY2(textObject != nullptr, qPrintable(textComponent.errorString())); QCOMPARE(textObject->font().bold(), true); QCOMPARE(textObject->font().italic(), false); - - delete textObject; } { QString componentStr = "import QtQuick 2.0\nText { font.italic: true; text: \"Hello World\" }"; QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); + QVERIFY2(textObject != nullptr, qPrintable(textComponent.errorString())); QCOMPARE(textObject->font().italic(), true); QCOMPARE(textObject->font().bold(), false); - - delete textObject; } { QString componentStr = "import QtQuick 2.0\nText { font.family: \"Helvetica\"; text: \"Hello World\" }"; QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); + QVERIFY2(textObject != nullptr, qPrintable(textComponent.errorString())); QCOMPARE(textObject->font().family(), QString("Helvetica")); QCOMPARE(textObject->font().bold(), false); QCOMPARE(textObject->font().italic(), false); - - delete textObject; } { QString componentStr = "import QtQuick 2.0\nText { font.family: \"\"; text: \"Hello World\" }"; QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); + QVERIFY2(textObject != nullptr, qPrintable(textComponent.errorString())); QCOMPARE(textObject->font().family(), QString("")); - - delete textObject; } } @@ -1189,17 +1215,19 @@ void tst_qquicktext::style() QString componentStr = "import QtQuick 2.0\nText { style: \"" + styleStrings.at(i) + "\"; styleColor: \"white\"; text: \"Hello World\" }"; QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); + QVERIFY2(textObject != nullptr, qPrintable(textComponent.errorString())); QCOMPARE((int)textObject->style(), (int)styles.at(i)); QCOMPARE(textObject->styleColor(), QColor("white")); - - delete textObject; } QString componentStr = "import QtQuick 2.0\nText { text: \"Hello World\" }"; QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); + QVERIFY2(textObject != nullptr, qPrintable(textComponent.errorString())); QRectF brPre = textObject->boundingRect(); textObject->setStyle(QQuickText::Outline); @@ -1207,8 +1235,6 @@ void tst_qquicktext::style() QVERIFY(brPre.width() < brPost.width()); QVERIFY(brPre.height() < brPost.height()); - - delete textObject; } void tst_qquicktext::color() @@ -1219,13 +1245,13 @@ void tst_qquicktext::color() QString componentStr = "import QtQuick 2.0\nText { color: \"" + colorStrings.at(i) + "\"; text: \"Hello World\" }"; QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); + QVERIFY2(textObject != nullptr, qPrintable(textComponent.errorString())); QCOMPARE(textObject->color(), QColor(colorStrings.at(i))); QCOMPARE(textObject->styleColor(), QColor("black")); QCOMPARE(textObject->linkColor(), QColor("blue")); - - delete textObject; } for (int i = 0; i < colorStrings.size(); i++) @@ -1233,7 +1259,9 @@ void tst_qquicktext::color() QString componentStr = "import QtQuick 2.0\nText { styleColor: \"" + colorStrings.at(i) + "\"; text: \"Hello World\" }"; QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); + QVERIFY2(textObject != nullptr, qPrintable(textComponent.errorString())); QCOMPARE(textObject->styleColor(), QColor(colorStrings.at(i))); // default color to black? @@ -1264,8 +1292,6 @@ void tst_qquicktext::color() textObject->setLinkColor(QColor("blue")); QCOMPARE(textObject->linkColor(), QColor("blue")); QCOMPARE(linkColorSpy.size(), 2); - - delete textObject; } for (int i = 0; i < colorStrings.size(); i++) @@ -1273,13 +1299,13 @@ void tst_qquicktext::color() QString componentStr = "import QtQuick 2.0\nText { linkColor: \"" + colorStrings.at(i) + "\"; text: \"Hello World\" }"; QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); + QVERIFY2(textObject != nullptr, qPrintable(textComponent.errorString())); QCOMPARE(textObject->styleColor(), QColor("black")); QCOMPARE(textObject->color(), QColor("black")); QCOMPARE(textObject->linkColor(), QColor(colorStrings.at(i))); - - delete textObject; } for (int i = 0; i < colorStrings.size(); i++) @@ -1293,13 +1319,13 @@ void tst_qquicktext::color() "text: \"Hello World\" }"; QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); + QVERIFY2(textObject != nullptr, qPrintable(textComponent.errorString())); QCOMPARE(textObject->color(), QColor(colorStrings.at(i))); QCOMPARE(textObject->styleColor(), QColor(colorStrings.at(j))); QCOMPARE(textObject->linkColor(), QColor(colorStrings.at(j))); - - delete textObject; } } { @@ -1310,11 +1336,11 @@ void tst_qquicktext::color() QString componentStr = "import QtQuick 2.0\nText { color: \"" + colorStr + "\"; text: \"Hello World\" }"; QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); + QVERIFY2(textObject != nullptr, qPrintable(textComponent.errorString())); QCOMPARE(textObject->color(), testColor); - - delete textObject; } { QString colorStr = "#001234"; QColor testColor(colorStr); @@ -1324,6 +1350,7 @@ void tst_qquicktext::color() textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); QScopedPointer<QObject> object(textComponent.create()); QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); + QVERIFY2(textObject != nullptr, qPrintable(textComponent.errorString())); QSignalSpy spy(textObject, SIGNAL(colorChanged())); @@ -1345,6 +1372,7 @@ void tst_qquicktext::color() textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); QScopedPointer<QObject> object(textComponent.create()); QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); + QVERIFY2(textObject != nullptr, qPrintable(textComponent.errorString())); QSignalSpy spy(textObject, SIGNAL(styleColorChanged())); @@ -1366,6 +1394,7 @@ void tst_qquicktext::color() textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); QScopedPointer<QObject> object(textComponent.create()); QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); + QVERIFY2(textObject != nullptr, qPrintable(textComponent.errorString())); QSignalSpy spy(textObject, SIGNAL(linkColorChanged())); @@ -1389,19 +1418,19 @@ void tst_qquicktext::smooth() QString componentStr = "import QtQuick 2.0\nText { smooth: false; text: \"" + standard.at(i) + "\" }"; QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); + QVERIFY2(textObject != nullptr, qPrintable(textComponent.errorString())); QCOMPARE(textObject->smooth(), false); - - delete textObject; } { QString componentStr = "import QtQuick 2.0\nText { text: \"" + standard.at(i) + "\" }"; QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); + QVERIFY2(textObject != nullptr, qPrintable(textComponent.errorString())); QCOMPARE(textObject->smooth(), true); - - delete textObject; } } for (int i = 0; i < richText.size(); i++) @@ -1410,19 +1439,19 @@ void tst_qquicktext::smooth() QString componentStr = "import QtQuick 2.0\nText { smooth: false; text: \"" + richText.at(i) + "\" }"; QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); + QVERIFY2(textObject != nullptr, qPrintable(textComponent.errorString())); QCOMPARE(textObject->smooth(), false); - - delete textObject; } { QString componentStr = "import QtQuick 2.0\nText { text: \"" + richText.at(i) + "\" }"; QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); + QVERIFY2(textObject != nullptr, qPrintable(textComponent.errorString())); QCOMPARE(textObject->smooth(), true); - - delete textObject; } } } @@ -1488,23 +1517,21 @@ void tst_qquicktext::weight() QString componentStr = "import QtQuick 2.0\nText { text: \"Hello world!\" }"; QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); QVERIFY(textObject != nullptr); QCOMPARE((int)textObject->font().weight(), int(QQuickFontEnums::Normal)); - - delete textObject; } { QString componentStr = "import QtQuick 2.0\nText { font.weight: Font.Bold; text: \"Hello world!\" }"; QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); QVERIFY(textObject != nullptr); QCOMPARE((int)textObject->font().weight(), int(QQuickFontEnums::Bold)); - - delete textObject; } } @@ -1553,56 +1580,51 @@ void tst_qquicktext::capitalization() QString componentStr = "import QtQuick 2.0\nText { text: \"Hello world!\" }"; QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); QVERIFY(textObject != nullptr); QCOMPARE((int)textObject->font().capitalization(), int(QQuickFontEnums::MixedCase)); - - delete textObject; } { QString componentStr = "import QtQuick 2.0\nText { text: \"Hello world!\"; font.capitalization: \"AllUppercase\" }"; QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); QVERIFY(textObject != nullptr); QCOMPARE((int)textObject->font().capitalization(), int(QQuickFontEnums::AllUppercase)); - - delete textObject; } { QString componentStr = "import QtQuick 2.0\nText { text: \"Hello world!\"; font.capitalization: \"AllLowercase\" }"; QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); QVERIFY(textObject != nullptr); QCOMPARE((int)textObject->font().capitalization(), int(QQuickFontEnums::AllLowercase)); - - delete textObject; } { QString componentStr = "import QtQuick 2.0\nText { text: \"Hello world!\"; font.capitalization: \"SmallCaps\" }"; QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); QVERIFY(textObject != nullptr); QCOMPARE((int)textObject->font().capitalization(), int(QQuickFontEnums::SmallCaps)); - - delete textObject; } { QString componentStr = "import QtQuick 2.0\nText { text: \"Hello world!\"; font.capitalization: \"Capitalize\" }"; QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); QVERIFY(textObject != nullptr); QCOMPARE((int)textObject->font().capitalization(), int(QQuickFontEnums::Capitalize)); - - delete textObject; } } @@ -1612,34 +1634,31 @@ void tst_qquicktext::letterSpacing() QString componentStr = "import QtQuick 2.0\nText { text: \"Hello world!\" }"; QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); QVERIFY(textObject != nullptr); QCOMPARE(textObject->font().letterSpacing(), 0.0); - - delete textObject; } { QString componentStr = "import QtQuick 2.0\nText { text: \"Hello world!\"; font.letterSpacing: -2 }"; QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); QVERIFY(textObject != nullptr); QCOMPARE(textObject->font().letterSpacing(), -2.); - - delete textObject; } { QString componentStr = "import QtQuick 2.0\nText { text: \"Hello world!\"; font.letterSpacing: 3 }"; QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); QVERIFY(textObject != nullptr); QCOMPARE(textObject->font().letterSpacing(), 3.); - - delete textObject; } } @@ -1649,34 +1668,31 @@ void tst_qquicktext::wordSpacing() QString componentStr = "import QtQuick 2.0\nText { text: \"Hello world!\" }"; QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); QVERIFY(textObject != nullptr); QCOMPARE(textObject->font().wordSpacing(), 0.0); - - delete textObject; } { QString componentStr = "import QtQuick 2.0\nText { text: \"Hello world!\"; font.wordSpacing: -50 }"; QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); QVERIFY(textObject != nullptr); QCOMPARE(textObject->font().wordSpacing(), -50.); - - delete textObject; } { QString componentStr = "import QtQuick 2.0\nText { text: \"Hello world!\"; font.wordSpacing: 200 }"; QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); QVERIFY(textObject != nullptr); QCOMPARE(textObject->font().wordSpacing(), 200.); - - delete textObject; } } @@ -1803,10 +1819,6 @@ public: QTextLayout layout; }; - -typedef QVector<QPointF> PointVector; -Q_DECLARE_METATYPE(PointVector); - void tst_qquicktext::linkInteraction_data() { QTest::addColumn<QString>("text"); @@ -2068,7 +2080,8 @@ void tst_qquicktext::linkInteraction() "}"; QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); QVERIFY(textObject != nullptr); @@ -2119,8 +2132,6 @@ void tst_qquicktext::linkInteraction() QCOMPARE(test.hoveredLink, QString()); QCOMPARE(textObject->hoveredLink(), QString()); QCOMPARE(textObject->linkAt(-1, -1), QString()); - - delete textObject; } void tst_qquicktext::baseUrl() @@ -2131,6 +2142,7 @@ void tst_qquicktext::baseUrl() QQmlComponent textComponent(&engine); textComponent.setData("import QtQuick 2.0\n Text {}", localUrl); QQuickText *textObject = qobject_cast<QQuickText *>(textComponent.create()); + QVERIFY2(textObject, qPrintable(textComponent.errorString())); QCOMPARE(textObject->baseUrl(), localUrl); @@ -2151,12 +2163,15 @@ void tst_qquicktext::baseUrl() void tst_qquicktext::embeddedImages_data() { + // Cancel some mess left by clipRectOutsideViewportDynamicallyChanged(): + qmlClearTypeRegistrations(); + QTest::addColumn<QUrl>("qmlfile"); QTest::addColumn<QString>("error"); QTest::newRow("local") << testFileUrl("embeddedImagesLocal.qml") << ""; QTest::newRow("local-error") << testFileUrl("embeddedImagesLocalError.qml") << testFileUrl("embeddedImagesLocalError.qml").toString()+":3:1: QML Text: Cannot open: " + testFileUrl("http/notexists.png").toString(); - QTest::newRow("local") << testFileUrl("embeddedImagesLocalRelative.qml") << ""; + QTest::newRow("local-relative") << testFileUrl("embeddedImagesLocalRelative.qml") << ""; QTest::newRow("remote") << testFileUrl("embeddedImagesRemote.qml") << ""; QTest::newRow("remote-error") << testFileUrl("embeddedImagesRemoteError.qml") << testFileUrl("embeddedImagesRemoteError.qml").toString()+":3:1: QML Text: Error transferring {{ServerBaseUrl}}/notexists.png - server replied: Not found"; @@ -2178,13 +2193,10 @@ void tst_qquicktext::embeddedImages() if (!error.isEmpty()) QTest::ignoreMessage(QtWarningMsg, error.toLatin1()); - QQuickView *view = new QQuickView; - view->rootContext()->setContextProperty(QStringLiteral("serverBaseUrl"), server.baseUrl()); - view->setSource(qmlfile); - view->show(); - view->requestActivate(); - QVERIFY(QTest::qWaitForWindowActive(view)); - QQuickText *textObject = qobject_cast<QQuickText*>(view->rootObject()); + QQuickView view; + view.rootContext()->setContextProperty(QStringLiteral("serverBaseUrl"), server.baseUrl()); + QVERIFY(QQuickTest::showView(view, qmlfile)); + QQuickText *textObject = qobject_cast<QQuickText*>(view.rootObject()); QVERIFY(textObject != nullptr); QTRY_COMPARE(textObject->resourcesLoading(), 0); @@ -2199,7 +2211,9 @@ void tst_qquicktext::embeddedImages() QCOMPARE(textObject->height(), 16.0); } - delete view; + // QTextDocument images are cached in QTextDocumentPrivate::cachedResources, + // so verify that we don't redundantly cache them in QQuickPixmapCache + QCOMPARE(QQuickPixmapCache::instance()->m_cache.size(), 0); } void tst_qquicktext::lineCount() @@ -2357,7 +2371,9 @@ void tst_qquicktext::implicitSize() "maximumLineCount: 2 }"; QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); + QVERIFY2(textObject, qPrintable(textComponent.errorString())); QVERIFY(textObject->width() < textObject->implicitWidth()); QCOMPARE(textObject->height(), textObject->implicitHeight()); @@ -2366,8 +2382,6 @@ void tst_qquicktext::implicitSize() textObject->resetWidth(); QCOMPARE(textObject->width(), textObject->implicitWidth()); QCOMPARE(textObject->height(), textObject->implicitHeight()); - - delete textObject; } void tst_qquicktext::implicitSizeMaxLineCount() @@ -2447,6 +2461,7 @@ void tst_qquicktext::contentSize() textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); QScopedPointer<QObject> object(textComponent.create()); QQuickText *textObject = qobject_cast<QQuickText *>(object.data()); + QVERIFY2(textObject, qPrintable(textComponent.errorString())); QSignalSpy spySize(textObject, SIGNAL(contentSizeChanged())); QSignalSpy spyWidth(textObject, SIGNAL(contentWidthChanged(qreal))); @@ -2504,6 +2519,7 @@ void tst_qquicktext::geometryChanged() textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); QScopedPointer<QObject> object(textComponent.create()); QQuickText *textObject = qobject_cast<QQuickText *>(object.data()); + QVERIFY2(textObject, qPrintable(textComponent.errorString())); const qreal implicitHeight = textObject->implicitHeight(); @@ -2763,6 +2779,7 @@ void tst_qquicktext::implicitSizeBinding() textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); QScopedPointer<QObject> object(textComponent.create()); QQuickText *textObject = qobject_cast<QQuickText *>(object.data()); + QVERIFY2(textObject, qPrintable(textComponent.errorString())); QCOMPARE(textObject->width(), textObject->implicitWidth()); QCOMPARE(textObject->height(), textObject->implicitHeight()); @@ -2951,10 +2968,10 @@ void tst_qquicktext::largeTextObservesViewport_data() Q_ASSERT(text.size() > QQuickTextPrivate::largeTextSizeThreshold); // by default, the root item acts as the viewport: - // QQuickTextNode doesn't populate lines of text beyond the bottom of the window + // QSGInternalTextNode doesn't populate lines of text beyond the bottom of the window QTest::newRow("default plain text") << text << QQuickText::PlainText << 0 << false; // make the rectangle into a viewport item, and move the text upwards: - // QQuickTextNode doesn't populate lines of text beyond the bottom of the viewport rectangle + // QSGInternalTextNode doesn't populate lines of text beyond the bottom of the viewport rectangle QTest::newRow("clipped plain text") << text << QQuickText::PlainText << 10 << true; { @@ -2998,13 +3015,13 @@ void tst_qquicktext::largeTextObservesViewport() QVERIFY(textItem); QQuickItem *viewportItem = textItem->parentItem(); QQuickTextPrivate *textPriv = QQuickTextPrivate::get(textItem); - QQuickTextNode *node = static_cast<QQuickTextNode *>(textPriv->paintNode); + QSGInternalTextNode *node = static_cast<QSGInternalTextNode *>(textPriv->paintNode); QFontMetricsF fm(textItem->font()); const qreal expectedTextHeight = (parentIsViewport ? viewportItem->height() : window.height() - viewportItem->y()); const qreal lineSpacing = qCeil(fm.height()); // A paragraph break is the same as an extra line break; so since our "lines" are paragraphs in StyledText, // visually, with StyledText we skip down 10 "lines", but the first paragraph you see says "line 5". - // It's OK anyway for the test, because QQuickTextNode::addTextLayout() treats the paragraph breaks like lines of text. + // It's OK anyway for the test, because QSGTextNode::addTextLayout() treats the paragraph breaks like lines of text. const int expectedLastLine = linesAboveViewport + int(expectedTextHeight / lineSpacing); viewportItem->setFlag(QQuickItem::ItemIsViewport, parentIsViewport); @@ -3029,6 +3046,29 @@ void tst_qquicktext::largeTextObservesViewport() QVERIFY(qAbs(renderedLineRange.second - (expectedLastLine + 1)) < (linesAboveViewport > 80 ? 4 : 2)); } +void tst_qquicktext::largeTextInDelayedLoader() // QTBUG-115687 +{ + QQuickView view; + QVERIFY(QQuickTest::showView(view, testFileUrl("loaderActiveOnVisible.qml"))); + auto flick = view.rootObject()->findChild<QQuickFlickable*>(); + QVERIFY(flick); + auto textItem = view.rootObject()->findChild<QQuickText*>(); + QVERIFY(textItem); + QQuickTextPrivate *textPriv = QQuickTextPrivate::get(textItem); + QSGInternalTextNode *node = static_cast<QSGInternalTextNode *>(textPriv->paintNode); + const auto initialLineRange = node->renderedLineRange(); + qCDebug(lcTests) << "first line rendered" << initialLineRange.first + << "; first line past viewport" << initialLineRange.second; + flick->setContentY(500); + QTRY_COMPARE_NE(node->renderedLineRange(), initialLineRange); + const auto scrolledLineRange = node->renderedLineRange(); + qCDebug(lcTests) << "after scroll: first line rendered" << scrolledLineRange.first + << "; first line past viewport" << scrolledLineRange.second; + // We scrolled a good bit more than one window-height, so we must render a + // non-overlapping range of text some distance past the initial blocks. + QCOMPARE_GT(scrolledLineRange.first, initialLineRange.second); +} + void tst_qquicktext::lineLaidOut() { QScopedPointer<QQuickView> window(createView(testFile("lineLayout.qml"))); @@ -3043,11 +3083,11 @@ void tst_qquicktext::lineLaidOut() for (int i = 0; i < textPrivate->layout.lineCount(); ++i) { QRectF r = textPrivate->layout.lineAt(i).rect(); - QVERIFY(r.width() == i * 15); + QCOMPARE(r.width(), i * 15); if (i >= 30) - QVERIFY(r.x() == r.width() + 30); + QCOMPARE(r.x(), r.width() + 30); if (i >= 60) { - QVERIFY(r.x() == r.width() * 2 + 60); + QCOMPARE(r.x(), r.width() * 2 + 60); QCOMPARE(r.height(), qreal(20)); } } @@ -3092,6 +3132,29 @@ void tst_qquicktext::lineLaidOutRelayout() } } +void tst_qquicktext::lineLaidOutFontUpdate() +{ + QScopedPointer<QQuickView> window(createView(testFile("lineLayoutFontUpdate.qml"))); + + window->show(); + window->requestActivate(); + QVERIFY(QTest::qWaitForWindowActive(window.data())); + + auto *myText = window->rootObject()->findChild<QQuickText*>("exampleText"); + QVERIFY(myText != nullptr); + + QQuickTextPrivate *textPrivate = QQuickTextPrivate::get(myText); + QVERIFY(textPrivate != nullptr); + + QCOMPARE(textPrivate->layout.lineCount(), 2); + + QTextLine firstLine = textPrivate->layout.lineAt(0); + QTextLine secondLine = textPrivate->layout.lineAt(1); + + QCOMPARE(firstLine.rect().x(), secondLine.rect().x() + 40); + QCOMPARE(firstLine.rect().width(), secondLine.rect().width() - 40); +} + void tst_qquicktext::lineLaidOutHAlign() { QScopedPointer<QQuickView> window(createView(testFile("lineLayoutHAlign.qml"))); @@ -3272,7 +3335,8 @@ void tst_qquicktext::imgTagsAlign() QString componentStr = "import QtQuick 2.0\nText { text: \"This is a test <img src=\\\"" + src + "\\\" align=\\\"" + align + "\\\"> of image.\" }"; QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), testFileUrl(".")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); QVERIFY(textObject != nullptr); QCOMPARE(textObject->height(), qreal(imgHeight)); @@ -3287,8 +3351,6 @@ void tst_qquicktext::imgTagsAlign() QVERIFY(br.y() == imgHeight / 2.0 - br.height() / 2.0); else if (align == "top") QCOMPARE(br.y(), qreal(0)); - - delete textObject; } void tst_qquicktext::imgTagsMultipleImages() @@ -3297,7 +3359,8 @@ void tst_qquicktext::imgTagsMultipleImages() QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), testFileUrl(".")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); QVERIFY(textObject != nullptr); QCOMPARE(textObject->height(), qreal(85)); @@ -3305,34 +3368,30 @@ void tst_qquicktext::imgTagsMultipleImages() QQuickTextPrivate *textPrivate = QQuickTextPrivate::get(textObject); QVERIFY(textPrivate != nullptr); QCOMPARE(textPrivate->extra->visibleImgTags.size(), 2); - - delete textObject; } void tst_qquicktext::imgTagsElide() { QScopedPointer<QQuickView> window(createView(testFile("imgTagsElide.qml"))); - QQuickText *myText = window->rootObject()->findChild<QQuickText*>("myText"); - QVERIFY(myText != nullptr); + QScopedPointer<QQuickText> myText(window->rootObject()->findChild<QQuickText*>("myText")); + QVERIFY(myText); - QQuickTextPrivate *textPrivate = QQuickTextPrivate::get(myText); + QQuickTextPrivate *textPrivate = QQuickTextPrivate::get(myText.data()); QVERIFY(textPrivate != nullptr); QCOMPARE(textPrivate->extra->visibleImgTags.size(), 0); myText->setMaximumLineCount(20); QTRY_COMPARE(textPrivate->extra->visibleImgTags.size(), 1); - - delete myText; } void tst_qquicktext::imgTagsUpdates() { QScopedPointer<QQuickView> window(createView(testFile("imgTagsUpdates.qml"))); - QQuickText *myText = window->rootObject()->findChild<QQuickText*>("myText"); - QVERIFY(myText != nullptr); + QScopedPointer<QQuickText> myText(window->rootObject()->findChild<QQuickText*>("myText")); + QVERIFY(myText); - QSignalSpy spy(myText, SIGNAL(contentSizeChanged())); + QSignalSpy spy(myText.data(), SIGNAL(contentSizeChanged())); - QQuickTextPrivate *textPrivate = QQuickTextPrivate::get(myText); + QQuickTextPrivate *textPrivate = QQuickTextPrivate::get(myText.data()); QVERIFY(textPrivate != nullptr); myText->setText("This is a heart<img src=\"images/heart200.png\">."); @@ -3346,8 +3405,6 @@ void tst_qquicktext::imgTagsUpdates() // if maximumLineCount is set and the img tag doesn't have an explicit size // we relayout twice. QCOMPARE(spy.size(), 3); - - delete myText; } void tst_qquicktext::imgTagsError() @@ -3361,10 +3418,10 @@ void tst_qquicktext::imgTagsError() + testFileUrl("images/starfish_2.pn").toString()); QTest::ignoreMessage(QtWarningMsg, expectedMessage.toLatin1()); textComponent.setData(componentStr.toLatin1(), testFileUrl(".")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); QVERIFY(textObject != nullptr); - delete textObject; } void tst_qquicktext::fontSizeMode_data() @@ -4027,9 +4084,6 @@ void tst_qquicktext::fontFormatSizes() } } -typedef qreal (*ExpectedBaseline)(QQuickText *item); -Q_DECLARE_METATYPE(ExpectedBaseline) - static qreal expectedBaselineTop(QQuickText *item) { QFontMetricsF fm(item->font()); @@ -4194,7 +4248,7 @@ void tst_qquicktext::baselineOffset_data() QTest::newRow("customLine") << "hello world" << "hello\nworld" - << QByteArray("height: 200; onLineLaidOut: line.y += 16") + << QByteArray("height: 200; onLineLaidOut: (line) => { line.y += 16; }") << &expectedBaselineCustom << &expectedBaselineCustom; @@ -4290,7 +4344,8 @@ void tst_qquicktext::baselineOffset_data() QTest::newRow("customLine with padding") << "hello world" << "hello\nworld" - << QByteArray("height: 200; topPadding: 10; bottomPadding: 20; onLineLaidOut: line.y += 16") + << QByteArray("height: 200; topPadding: 10; bottomPadding: 20; " + "onLineLaidOut: (line) => { line.y += 16; }") << &expectedBaselineCustom << &expectedBaselineCustom; @@ -4388,7 +4443,7 @@ void tst_qquicktext::htmlLists() QFETCH(QString, text); QFETCH(int, nbLines); - QQuickView *view = createView(testFile("htmlLists.qml")); + QScopedPointer<QQuickView>view(createView(testFile("htmlLists.qml"))); QQuickText *textObject = view->rootObject()->findChild<QQuickText*>("myText"); QQuickTextPrivate *textPrivate = QQuickTextPrivate::get(textObject); @@ -4400,11 +4455,9 @@ void tst_qquicktext::htmlLists() view->show(); view->requestActivate(); - QVERIFY(QTest::qWaitForWindowActive(view)); + QVERIFY(QTest::qWaitForWindowActive(view.get())); QCOMPARE(textPrivate->extra->doc->lineCount(), nbLines); - - delete view; } void tst_qquicktext::htmlLists_data() @@ -4489,9 +4542,9 @@ void tst_qquicktext::padding() QTRY_COMPARE(window->status(), QQuickView::Ready); window->show(); QVERIFY(QTest::qWaitForWindowExposed(window.data())); - QQuickItem *root = window->rootObject(); + QScopedPointer<QQuickItem> root(window->rootObject()); QVERIFY(root); - QQuickText *obj = qobject_cast<QQuickText*>(root); + QQuickText *obj = qobject_cast<QQuickText*>(root.data()); QVERIFY(obj != nullptr); qreal cw = obj->contentWidth(); @@ -4582,8 +4635,6 @@ void tst_qquicktext::padding() QCOMPARE(obj->leftPadding(), 0.0); QCOMPARE(obj->rightPadding(), 0.0); QCOMPARE(obj->bottomPadding(), 0.0); - - delete root; } void tst_qquicktext::paddingInLoader() // QTBUG-83413 @@ -4618,23 +4669,21 @@ void tst_qquicktext::hintingPreference() QString componentStr = "import QtQuick 2.0\nText { text: \"Hello world!\" }"; QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); QVERIFY(textObject != nullptr); QCOMPARE((int)textObject->font().hintingPreference(), (int)QFont::PreferDefaultHinting); - - delete textObject; } { QString componentStr = "import QtQuick 2.0\nText { text: \"Hello world!\"; font.hintingPreference: Font.PreferNoHinting }"; QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); - QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); + QScopedPointer<QObject> object(textComponent.create()); + QQuickText *textObject = qobject_cast<QQuickText*>(object.data()); QVERIFY(textObject != nullptr); QCOMPARE((int)textObject->font().hintingPreference(), (int)QFont::PreferNoHinting); - - delete textObject; } } @@ -4710,6 +4759,7 @@ void tst_qquicktext::fontInfo() QScopedPointer<QObject> object(component.create()); QObject *root = object.data(); + QVERIFY2(root, qPrintable(component.errorString())); QQuickText *main = root->findChild<QQuickText *>("main"); QVERIFY(main); @@ -4806,6 +4856,8 @@ void tst_qquicktext::displaySuperscriptedTag() QCOMPARE(color.green(), 255); } +QT_END_NAMESPACE + QTEST_MAIN(tst_qquicktext) #include "tst_qquicktext.moc" |