summaryrefslogtreecommitdiffstats
path: root/tests/auto/gui
Commit message (Collapse)AuthorAgeFilesLines
...
* | Add support for node parameters in QShaderGraphLoaderKevin Ottens2017-07-081-32/+39
| | | | | | | | | | | | | | | | Now the parameters from the prototypes are used as default values and the graph file can overload them. Change-Id: I9a8a73963c7e578bd0a34e96f76f147a12224f4f Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Add support for node parameters in QShaderNodesLoaderKevin Ottens2017-07-081-13/+26
| | | | | | | | | | | | | | | | This will allow to make the prototypes more extensible when referred to from a graph file while providing some sane defaults. Change-Id: I1ae10182427d8a7d29c51a64e19e99139494ea92 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Add parameters to QShaderNodeKevin Ottens2017-07-081-2/+47
| | | | | | | | | | | | | | | | | | This will allow to create nodes having an entry point for tuning, still need to be exploited by the loaders and the shader generator. Coming in further commits. Change-Id: I8384b0f528c9919e9f8d35102adde2b307f08b80 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Complete the QShaderGraphLoader tests to introspect nodesKevin Ottens2017-07-081-0/+45
| | | | | | | | | | | | | | | | We forgot to check that the node content was correct and complete when loading the graph. Change-Id: Id4ee6aaba6ca268b0785e7fa3fb51a19817e7c9c Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Allow QImage with more than 2GByte of image dataAllan Sandfeld Jensen2017-07-082-5/+32
| | | | | | | | | | | | | | | | | | | | | | | | Changes internal data-size and pointer calculations to qssize_t. Adds new sizeInBytes() accessor to read byte size, and marks the old one deprecated. Task-number: QTBUG-50912 Change-Id: Idf0c2010542b0ec1c9abef8afd02d6db07f43e6d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-07-062-2/+4
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I43531e087bb810889d5c1fbfcdffb29b78804839
| * Blacklist tst_QWindow::positioning on macOS 10.12Simon Hausmann2017-07-031-0/+3
| | | | | | | | | | | | Change-Id: I41f46e8387519a691d3df9a4fdcc577916e6d247 Task-number: QTQAINFRA-1332 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Fix BMP ImageFormat for semi-transparent filesAllan Sandfeld Jensen2017-07-031-2/+1
| | | | | | | | | | | | | | | | | | Reads the v4 and v5 info-header together with the rest of the info- headers, and use that to report the correct image format before decoding. Change-Id: I69e2bcc54367b7f14820815ae2ae1fa2d8d5dc8c Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | Use qRadiansToDegrees() and qDegreesToRadians() more widelyEdward Welbourne2017-07-053-9/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Especially in examples, where we should show off our convenience functions, prefer calling these functions over doing arithmetic with M_PI (or approximations thereto) and 180 (give or take simple factors). This incidentally documents what's going on, just by the name of the function used (and reveals at least one place where variables were misnamed; the return from atan is in radians, *not* degrees). Task-number: QTBUG-58083 Change-Id: I6e5d66721cafab423378f970af525400423e971e Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-07-043-3/+5
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qprocess_unix.cpp src/plugins/platforms/xcb/qxcbconnection.cpp src/plugins/platforms/xcb/qxcbwindow.cpp src/widgets/util/util.pri tests/auto/corelib/thread/qthread/qthread.pro tests/auto/corelib/thread/qthread/tst_qthread.cpp Change-Id: I5c45ab54d46d3c75a5c6c116777ebf5bc47a871b
| * Convert features.tabletevent to QT_CONFIGStephan Binner2017-06-281-2/+2
| | | | | | | | | | Change-Id: Ibd7ed7f269a64afddadee70979b20f1c58398378 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * Merge remote-tracking branch 'origin/5.9.1' into 5.9Tor Arne Vestbø2017-06-251-0/+2
| |\ | | | | | | | | | Change-Id: Ie585425d2d8d05c6ead283b70b88b00e1e3dc1fe
| | * Blacklist flaky tst_QGuiEventLoop::testQuitLock() on macOS 10.12J-P Nurmi2017-06-191-0/+2
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-61499 Change-Id: I6eebe2305b47f9ae7be128c3d7a7535f6f04a4da Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * | Fix tst_QOpenGlConfig for platforms with builtin test dataOliver Wolff2017-06-191-1/+1
| |/ | | | | | | | | Change-Id: Ifd57002b730987105554514b3498f5e3bb4962e4 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* | Remove requirement to call QWindow::setMask after creating windowTor Arne Vestbø2017-06-281-7/+18
| | | | | | | | | | | | | | | | | | | | | | Like other QWindow properties we can just store it, and the platform window should pick it up on creation like other properties. [ChangeLog][QtGui][QWindow] setMask() no longer requires the window to be created to have an effect; it can be set at any time. Change-Id: I55b616363801b770bd61bda5325b443013b99866 Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
* | qt_findAtNxFile(): account for .9 (9-patch image) extensionsMitch Curtis2017-06-244-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently a file with a .9.png extension will only have its @2x variant found if it follows this format: foo.9@2x.png Since ".9" should be considered part of the file suffix, it should ideally be able to look like this and still be picked up: foo@2x.9.png This patch makes qt_findAtNxFile() account for .9.* extensions. This is needed for the image-based style support in Qt Quick Controls 2, which uses 9-patch images. qmlbench benchmark results using benchmarks\auto\creation\quick.image\delegates_image.qml with QT_SCALE_FACTOR=2 show no difference in performance after this patch is applied. [ChangeLog][QtGui] High DPI variants of 9-patch images can now be loaded using the following syntax: "foo@2x.9.png" Change-Id: I6d1384113bef21b4fe85a104ee6b16869c93b077 Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* | Sort the keys before comparing them in the testKevin Ottens2017-06-221-1/+6
| | | | | | | | | | | | | | | | The return order of the keys is random, so let's sort both first, then we can compare the lists. Should get rid of the test flakiness. Change-Id: I2e89d3cc603da6a4667b3677350baa4d40d59b45 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | [Shader Graph Gen.] Introduce QShaderNodesLoaderKevin Ottens2017-06-203-0/+295
| | | | | | | | | | | | | | | | | | This class allows to node definitions from a JSON representation. This will come in handy to ship preset prototypes for use with QShaderGraphLoader. Change-Id: I3f3b5d7852e17d484069b4814ee6e5910997c613 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | [Shader Graph Gen.] Introduce QShaderGraphLoaderKevin Ottens2017-06-203-0/+558
| | | | | | | | | | | | | | | | | | | | This class allows to load a shader graph from its JSON representation. To avoid duplicating the shader snippets inside of the JSON which would be a maintenance nightmare, we instead allow to register a set of node prototypes by their name and only refer to said names inside the JSON. Change-Id: I3e7b39e8b3c25f51f331a0a59dda883ac8e2bc57 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | [Shader Graph Gen.] Introduce QShaderGeneratorKevin Ottens2017-06-203-0/+360
| | | | | | | | | | | | | | This class is meant to generate code from shader graphs Change-Id: I1cf22352387f3f9f55e7589aa77a296689836911 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | [Shader Graph Gen.] Introduce QShaderGraph::StatementKevin Ottens2017-06-201-0/+408
| | | | | | | | | | | | | | | | This is our "byte code" representing a flattened graph. It will be used as input for the code generation. Change-Id: Ie02a60d07c035f3d16872e79931eb7cde168a8d1 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | [Shader Graph Gen.] Introduce QShaderGraphKevin Ottens2017-06-203-0/+257
| | | | | | | | | | | | | | | | This allows to connect our nodes together via ports. This way user code can assemble a shader from simpler blocks. Change-Id: I168dcf4af6aa11ad47b68d91e5a55e96ca922678 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | [Shader Graph Gen.] Introduce QShaderNodeKevin Ottens2017-06-201-0/+159
| | | | | | | | | | | | | | | | Nodes will allow to describe inputs, outputs or value transformations in a shader graph. Change-Id: I44f806d9595fd0e68fc9026cda2b4fa0a62af283 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | [Shader Graph Gen.] Introduce QShaderNodePortKevin Ottens2017-06-201-0/+56
| | | | | | | | | | | | | | The ports will be used to connect nodes from our shader graphs. Change-Id: I9d4fbb1f7bd8320c4373ebb166a4fe13bd1482c9 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | [Shader Graph Gen.] Introduce QShaderFormatKevin Ottens2017-06-203-0/+287
| | | | | | | | | | | | | | | | | | | | | | This is the first building block toward a node based generator for shader programs. QShaderFormat will be used by the other classes to qualify in which format the code snippets and includes used are. Change-Id: I11aefc6bb359832a853ed1b6bec302dc3516cfc4 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Be (somewhat more) consistent about the value of piEdward Welbourne2017-06-201-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use M_PI (and friends), where possible, in favor of hand-coded approximations of various (in)accuracies. Where that's not available (e.g. fragment shaders), use the same value that qmath.h uses for M_PI, for consistency. Replaced math.h with qmath.h in places that defined a fall-back in case math.h omits it (it's not in the C++ standard, although M_PI is in POSIX); or removed this entirely where it wasn't used. Reworked some code to reduce the amount of arithmetic needed, in the process; e.g. pulling common factors out of loops. Revised an example's doc to not waste time talking about using a six-sig-fig value for pi (which we no longer do) - it really wasn't relevant, or anything to be proud of; nor did the doc mention its later use. Task-number: QTBUG-58083 Change-Id: I5a31e3a2b6a823b97a43209bed61a37b9aa6c05f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-06-194-4/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qprocess_unix.cpp src/corelib/io/qprocess_win.cpp src/plugins/platforms/android/qandroidplatformintegration.h src/plugins/platforms/windows/qwindowscontext.cpp src/plugins/platforms/windows/windows.pri src/tools/uic/cpp/cppwriteinitialization.cpp src/widgets/doc/src/widgets-and-layouts/gallery.qdoc Change-Id: I8d0834c77f350ea7540140c2c7f372814afc2d0f
| * Fix tst_QImageReader::imageFormatBeforeReadAllan Sandfeld Jensen2017-06-181-1/+3
| | | | | | | | | | | | | | | | | | | | | | The test was never loading images from a valid path, and thus never had any fullfill the base option which meant nothing was tested. Making it work revealed that the Format option on BMP formats doesn't predict semi-transparent files. Change-Id: I7035a0f63ebfbce940ce7a17a6142cf177480798 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| * Blacklist tst_QGuiEventLoop::processEvents in macOS 10.12Tony Sarajärvi2017-06-181-0/+2
| | | | | | | | | | | | Task-number: QTBUG-61131 Change-Id: Ia54d0976f73e733199503e3510daf3d6fa4253a7 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Fix tst_QIcon for configurations with builtin_testdataOliver Wolff2017-06-132-2/+2
| | | | | | | | | | Change-Id: Ibf9fcf7d3a8d58c9c488637a45985593950defaf Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * winrt: Fix tst_QImageReaderOliver Wolff2017-06-131-1/+1
| | | | | | | | | | Change-Id: I3a7db49329d8f1677c17267f5878d5144ad37823 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-06-073-3/+13
|\| | | | | | | | | | | | | Conflicts: src/widgets/widgets/qmenu.cpp Change-Id: I6d3baf56eb24501cddb129a3cb6b958ccc25a308
| * winrt: Use styleHint as clue for fallbacks for font familiesOliver Wolff2017-06-011-1/+1
| | | | | | | | | | | | | | | | Similar on how it is done for Windows desktop we also use the given style hint when building the list of fallbacks a font family. Change-Id: I71378581d07f20ebe5bf0bc757bba919cc70e118 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
| * QAbstractItemModel::supportedDragActions: fix regressionDavid Faure2017-05-311-0/+8
| | | | | | | | | | | | | | | | | | | | | | This method now returns -1 by default, due to commit 6255cb893d which mistakenly replaced -1 with Qt::IgnoreAction (0x0). As a result, dropping is forbidden in a number of applications (I detected this in zanshin). Change-Id: I4922451216e08d5d3fe36f8ba87364a361b691bf Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
| * winrt: Fix tst_QPainterPathOliver Wolff2017-05-311-2/+4
| | | | | | | | | | | | | | | | We have to use a temporary data path for winrt, as the applications are sandboxed and cannot just put data anywhere. Change-Id: I8f95de132e5b5ac77441cbbf26af873b8018c7cb Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-05-291-0/+61
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf mkspecs/common/msvc-desktop.conf mkspecs/win32-g++/qmake.conf mkspecs/win32-icc/qmake.conf src/platformsupport/fontdatabases/mac/coretext.pri src/plugins/platforms/cocoa/qcocoawindow.h src/plugins/platforms/cocoa/qcocoawindow.mm Change-Id: I74a6f7705c9547ed8bbac7260eb4645543e32655
| * Fix painterpath rect intersections with points on the rectAllan Sandfeld Jensen2017-05-171-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | QPainterPath could in certain cases where sub-path points were on the border of a rect fail to calculate intersects() correctly. The patch adds handling of such cases by looking if end points cross in or out of the rect. Other cases are already caught. Task-number: QTBUG-31551 Change-Id: I6284da8ff8646d4636702923a76362302dde5767 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| * Add test-case for intersection equalityAllan Sandfeld Jensen2017-05-171-0/+49
| | | | | | | | | | | | | | | | Test-case taken from QTBUG-17027 Task-number: QTBUG-17027 Change-Id: I92ceb76addc4a61d19963d89f89e1f6386d8a049 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | Add QPolygon::intersects() methodsAllan Sandfeld Jensen2017-05-181-0/+42
| | | | | | | | | | | | | | | | | | Corresponds to the similar function QPainterPath::intersects() and is faster than calculating the intersection and then checking if it is empty. Change-Id: I694bb2206ed330a456a41d4118a952a68177b7a2 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devFrederik Gladhorn2017-05-103-4/+20
|\| | | | | | | Change-Id: I172e3e19ddcc5b7665e6c8382d725e7cc4f9794f
| * Skip failing autotests with b2qt toolchainTeemu Holappa2017-05-093-4/+20
| | | | | | | | | | | | | | Task-number: QTBUG-59966 Change-Id: I36d114107187db22841ebfeff8fa8175daff6d03 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-05-073-0/+272
|\| | | | | | | | | | | | | | | Conflicts: src/network/access/qnetworkreply.cpp tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp Change-Id: Iadf766269454087e69fb216fc3857d85b0ddfaad
| * QIconLoaderEngine: Fix actualSize() for no-entryPalo Kisa2017-05-031-0/+1
| | | | | | | | | | | | | | | | | | Return an empty size if no suitable entry found to avoid mismatch with the returned pixmap()'s size (the QIconEngine::actualSize() returns the originally requested size). Change-Id: Ia278719a54392b62c5f9fc0529476baba5cd7df0 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
| * Fix return of empty paths with multiple points on intersectionsAllan Sandfeld Jensen2017-04-281-0/+255
| | | | | | | | | | | | | | | | | | | | The intersection algorithm for intersection with rects, might return one edge of the rect even if that edge does not intersect with the path. To deal with that we collapse paths with empty bounding rects to the empty path. Task-number: QTBUG-60024 Change-Id: I3e305983c66548e772d7d7ce3de99d715edbdd1b Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| * Fix tst_QWindow modal dialog tests for offscreen and minimal platformsSami Nurmenniemi2017-04-261-0/+16
| | | | | | | | | | | | | | | | Changed testing of focus of modal dialogs to match behavior on offscreen and minimal platforms. Change-Id: Ife3ea41b4b78df2e64c8d8e740332914b1e5a67c Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* | tests/auto/gui: use new QTest::addRow() moreMarc Mutz2017-04-242-47/+46
| | | | | | | | | | | | | | | | | | | | | | | | ... for calculated test data names. In tst_qimage.cpp, use QLatin1String instead of QString for image format pretty-printing, to avoid needless memory allocation and, more importantly in the context of this patch, to make the result usable with addRow(), which does not support %ls. Change-Id: Ib1953aee2da235ae912917a450491ac8be69ca3a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Fix CSS line-height property multiplier value handlingJoni Poikelin2017-04-211-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CSS style such as "line-height: 1.5;" should be used as a multiplier, but Qt uses it as percentage which makes line spacing way too small. To workaround this, convert it to percent and use as QTextBlockFormat::ProportionalHeight instead. [ChangeLog][QtGui][Important Behvior Changes] Changed CSS line-height property with multiplier to follow CSS spec Task-number: QTBUG-56848 Task-number: QTCREATORBUG-17683 Change-Id: Icc98f7c0d4d07542a220702c287f23fa450ef875 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-04-205-2/+46
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/tools/qbytearray.h src/corelib/tools/qdatetime.h src/corelib/tools/qstring.h src/corelib/tools/qversionnumber.h src/plugins/platforms/android/qandroidplatformintegration.cpp tests/auto/corelib/tools/qhashfunctions/tst_qhashfunctions.cpp Change-Id: Iefd92a435e687a76cd593099e40d9a9620a1454d
| * Fix PNGs saved from QImage transform of 8-bit imagesAllan Sandfeld Jensen2017-04-191-0/+14
| | | | | | | | | | | | | | | | | | | | | | Fixes two separate errors. QImage::transform was incorrectly adding colors to the color-table of the returned image when the converted image would not be indexed, and qpnghandler was looking at non-empty color- table instead of color format. Task-number: QTBUG-43708 Change-Id: Ife14b6428ca65ac7d3a0b36a89a73e56d64586b4 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| * Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-04-181-0/+4
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.cpp Change-Id: I375fa4afa662fa411a15f212ebd5f2f0dffdba7f
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-15 06:14:38 +0000