summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Regenerate projects one last time before mergewip/cmakeAlexandru Croitor2020-02-12301-782/+478
| | | | | | Change-Id: Ia24cf56b79ca6dacd370a7e397024e9b663e0167 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* CMake: Regenenerate projects where recent changes happenedAlexandru Croitor2020-02-113-4/+9
| | | | | Change-Id: If86e49d73a45b7cfc494fa48bdc6cb1ba503b112 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Merge "Merge remote-tracking branch 'origin/wip/cmake' into dev"Alexandru Croitor2020-02-111-0/+31
|\
| * Merge remote-tracking branch 'origin/wip/cmake' into devAlexandru Croitor2020-02-101-0/+31
| |\ | | | | | | | | | Change-Id: If75ae006db6eb977cf66af4c3d36cb5c8098a1f1
| | * Regenerate rest of qtbaseAlexandru Croitor2020-02-041-0/+31
| | | | | | | | | | | | | | | | | | Change-Id: I3a1ce255d26522d8ad6694c5b0daaa53fb694de3 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | QSpinBox: remove deprecated signal valueChanged(const QString &)Vitaly Fanaskov2020-02-102-4/+4
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-81845 Change-Id: I91148cac553f63b44968337ccc121e7376ee4465 Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
* | | QComboBox: remove deprecated signalsVitaly Fanaskov2020-02-102-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following signals have been removed: - void activated(const QString &); - void highlighted(const QString &); Task-number: QTBUG-81845 Change-Id: I61b552d9258987d4252202953aaf4909f9bd718e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
* | | QVector: implement methods for adding new elements constructed in placeVitaly Fanaskov2020-02-101-0/+181
|/ / | | | | | | | | | | | | Fixes: QTBUG-80293 Change-Id: I687dc05a9ad2bad7bab3dc2b1173edf75550d57e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Blacklist tst_QGuiApplication::quitOnLastWindowClosedMulti on macOS in CITor Arne Vestbø2020-02-081-0/+3
| | | | | | | | | | | | Change-Id: I55cb9a6b3aebac68fb1b20127ba7aa501b4a3f2b Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Introduce a configure-time check for C++17 filesystemMårten Nordheim2020-02-072-7/+7
| | | | | | | | | | | | | | | | | | Various compilers have various fun ways of failing to compile when it is used so let's check if they will work properly during configure rather than much later. Change-Id: Ia93d4b91b3d269b4cab2a5f677c3c89e06b44ce3 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* | moc: Extend revision markers to allow for major and minor versionUlf Hermann2020-02-071-8/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | As we want Qt's own revisions to follow the Qt versioning scheme, we need to allow for the minor version to reset to 0 now. In order to facilitate this, we interpret the argument passed the current Q_REVISION macro as major version and allow for an optional minor version. Both are encoded it into the resulting revision number. Change-Id: I3519fe20233d473f34a24ec9589d045cdd162a12 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* | Replace the QMatrix field of QTransform with qreal[3][3]Jarek Kobus2020-02-071-63/+0
| | | | | | | | | | | | | | | | | | | | | | Remove temporarily the reference returned by QTransform::toAffine() since we don't keep the QMatrix object internally anymore. This is done in order to compile the rest of the code. The follow-up patch is going to remove that method completely. Task-number: QTBUG-81628 Change-Id: If7140eedb7582d81ac8da529017cf792174e86ab Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Merge "Merge remote-tracking branch 'origin/wip/cmake' into dev"Alexandru Croitor2020-02-071118-12/+21995
|\ \
| * | Merge remote-tracking branch 'origin/wip/cmake' into devAlexandru Croitor2020-02-031118-12/+21995
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This pulls the CMake port, which not only adds CMake files but also modifies existing code. A brief summary of "seemingly unrelated" changes: * configure.json was re-formatted to not use multi-line strings. That is an extension of the Qt JSON parser but not JSON compliant, which is needed for the configure.json-to-cmake conversion script (python). * Some moc inclusions were added due to CMake's slightly different way of handling moc. With the changes the files build with qmake and cmake. * Since CMake just grep's for the Q_OBJECT macro to determine whether to call moc (instead of doing pre-processing like qmake), the existing use of "Q_OBJECT" in our documentation was changed to \Q_OBJECT, which cmake doesn't see and which is now a qdoc macro. * QTestLib's qFindTestData was extended to also search in the source directory known at build time. What this change also brings is a new way of building modules in Coin by using YAML configuration files that describe the steps of building and testing in Coin specific terms. The platform configuration files in qt5 are instructed to use the old Coin built-in way of testing ("UseLegacyInstructions" feature) but for any configurations that do not have this, these yaml files in the coin/ sub-directory are used and shared across repositories. Change-Id: I1d832c3400e8d6945ad787024ba60e7440225c08
| | * Post-merge fixesAlexandru Croitor2020-01-306-3/+19
| | | | | | | | | | | | | | | Change-Id: I6acd29103f6cc550544e7422328d97ea0e2dcafb Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2020-01-2979-261/+9491
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/Qt5CoreConfigExtras.cmake.in src/corelib/Qt5CoreMacros.cmake src/dbus/Qt5DBusConfigExtras.cmake.in src/widgets/Qt5WidgetsConfigExtras.cmake.in Change-Id: Ib782f3b177c38b2cce83beebe15be9c0baa578f7
| | * | Relax rules about not having dbus sessionMichal Klocek2020-01-271-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some desktops do not run dbus session and still want to build qt. Change-Id: I898a3c25c9b47c1a953e426873280ab9e160c669 Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| | * | Post Merge FixesLeander Beernaert2020-01-2416-99/+68
| | | | | | | | | | | | | | | | | | | | Change-Id: I1e06c01b76b119c3f23b6e6ecbaae8df719b70ce Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| | * | Merge remote-tracking branch 'origin/dev' into merge-devLeander Beernaert2020-01-24289-7639/+115080
| | |\ \ | | | | | | | | | | | | | | | Change-Id: I31b761cfd5ea01373c60d02a5da8c33398d34739
| | * | | Regenerate TestsLeander Beernaert2020-01-1624-19/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I78f1efbec809610bcf6a8224392fa0dc8dbf3b3b Reviewed-by: Qt CMake Build Bot Reviewed-by: Cristian Adam <cristian.adam@qt.io>
| | * | | Add QT_TEST_RUNNING_IN_CTEST environment variable for testLeander Beernaert2020-01-141-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running tests with CMake's CTest, set the environment QT_TEST_RUNNING_IN_CTEST to 1. This can be useful to deal with tests that do not properly work when running from CTest. For instance, the qmake test in this patch has one test that only works when not run from CTest. Change-Id: I01eea9131de69c18118a9ed9f96e9296d5ea20f1 Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| | * | | Disable qaccessibilitylinux testLeander Beernaert2020-01-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The qaccessibilitylinux does not work properly and is also disabled in qmake. Change-Id: I8d047c86c792751f28f296b00421babeb42db778 Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| | * | | Fix qclipboard testLeander Beernaert2020-01-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I24ef0a8f73faa83d98d791a30f5777aef9d554cf Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | | Fix qnetworksession testLeander Beernaert2020-01-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8d549b571dea8c0b275a6c220dd58f1644ebc443 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | | Fix tst_qdbusmarshallLeander Beernaert2020-01-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia7bb50a8c69a0083d0b8acdad0cb8eb6a71ca24e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | | Fix tst_qloggingLeander Beernaert2020-01-102-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass in the QT_CMAKE_BUILD define to change the expected executable name in the tests. Add special cases for missing compile flags that cause the collection of backtraces to fail otherwise. Change-Id: I53c44f7e4c6d597f941e4dd8173b3a39a615339c Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | | Implement qtbase fixes for superbuildsJean-Michaël Celerier2020-01-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0d3445cf0740e3925fa9342dac4d07892518afe5 Reviewed-by: Qt CMake Build Bot Reviewed-by: Cristian Adam <cristian.adam@qt.io>
| | * | | Fix qmake builds of socket testsAlexandru Croitor2019-12-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qabstractsocketengine.cpp was changed to explicitly include its header moc file, which works with AUTOMOC, but doesn't with qmake. The header file needs to be explicitly listed in the HEADERS variable. Amends 2a1fc7b835bc2fc90e129e58a8a9e7831cd3b994. Change-Id: I9d31288d1f1eb2310679a7e685bd7ea458a77920 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| | * | | Fix qmake buildsAlexandru Croitor2019-12-112-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We did some changes in the .cpp files of some tests when converting the build system to CMake, but didn't adjust the .pro files which caused tests to fail when doing a qmake build. Make the required changes. Was discovered when doing a test wip/cmake -> dev merge. Change-Id: I407a982412cb44df592a38a4cb997968bdfe3304 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | | Add initial support for cross-building to iOSAlexandru Croitor2019-12-032-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tested locally with the following configurations: - iOS device builds (arm64) - iOS simulator builds (x86_64) - iOS simulator_and_device builds (fat arm64 and x86_64 archives) All iOS builds currently require a custom vcpkg fork which contains fixes for building the required 3rd party libraries. qtsvg, qtdeclarative, qtgraphicaleffects and qtquickcontrols2 have also been tested to build successfully. simulator_and_device builds are also supported, but require an umerged patch in upstream CMake as well as further patches to vcpkg. Task-number: QTBUG-75576 Change-Id: Icd29913fbbd52a60e07ea5253fd9c7af7f8ce44c Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Qt CMake Build Bot Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
| | * | | Post merge fixesLeander Beernaert2019-11-2530-35/+125
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I78d3c9687f99c0a32da04257e297e88ef0b02581 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| | * | | Merge remote-tracking branch 'origin/dev' into wip/cmakeLeander Beernaert2019-11-19213-5716/+13908
| | |\ \ \ | | | | | | | | | | | | | | | | | | Change-Id: Ifecc2d9db396d783124df8567553ba5f846f30bb
| | * | | | Convert all of tests/manualLeander Beernaert2019-11-14144-97/+3245
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: QTBUG-78164 Change-Id: I28b59bf84533fc33fafafd1511b5337d36af0e2b Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| | * | | | Fix build for tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobjectLeander Beernaert2019-11-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9c793e38b89cc00c8835bdcf85e9ab0b714da1c8 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| | * | | | Regenerate qtbase tests and src/* for some small fixesAlexandru Croitor2019-11-139-20/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I049829492971875a5c5ff159104707d9e2ad1e46 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | | | Regenerate tests/auto/testlibAlexandru Croitor2019-11-13114-755/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If1b2e105836b73b1a68ed5a8e11feb8e114d66e2 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | | | Regenerate tests/auto/sqlAlexandru Croitor2019-11-1313-13/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If411b1e7c3a7cb58922e5a48309f42ba29f2c068 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | | | Regenerate tests/auto/printsupportAlexandru Croitor2019-11-134-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I517adae77f7a5851b07fa660732318c175570fb9 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | | | Regenerate tests/auto/otherAlexandru Croitor2019-11-135-0/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib1753d1869f5af1900fbeaf2e95d3160cf979ca8 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | | | Regenerate tests/auto/openglAlexandru Croitor2019-11-134-8/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9bd417ae02db1b6827e09baab301152f3614da80 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | | | Regenerate tests/auto/dbusAlexandru Croitor2019-11-1326-51/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I105eb73065e02a4fa508d17f481047b32875f128 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | | | Regenerate tests/auto/concurrentAlexandru Croitor2019-11-138-9/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6a291f7dd70f78c5cafb6d96a1c0d57ed7223c8b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | | | Regenerate tests/auto/network/sslAlexandru Croitor2019-11-1314-77/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib05f4e3c8dea934ce48776fdd50305f7c98c1adb Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | | | Regenerate tests/auto/network/socketAlexandru Croitor2019-11-1314-35/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I653f7f4a6e3421f56f873cfbec4309eca49f1756 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | | | Regenerate tests/auto/network/bearerAlexandru Croitor2019-11-135-17/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I57526fa99376708203fb1723f3b85243925a1273 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | | | Regenerate tests/auto/network/accessAlexandru Croitor2019-11-1315-51/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I18839ef583336fa2fa42cb4325fdb007675df213 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | | | Regenerate tests/auto/network/kernelAlexandru Croitor2019-11-1310-35/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I770fce0f0a369204178ea0dfa7bbd8b210dd3585 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | | | Regenerate tests/auto/widgets/utilAlexandru Croitor2019-11-135-5/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icda122f04c8857f237e822d3981befb78885309b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | | | Regenerate tests/auto/widgets/graphicsviewAlexandru Croitor2019-11-1318-35/+302
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2e6a8f2f92e9cb8d6bb0be53068dfd43ba87db4c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | | | Regenerate tests/auto/widgets/itemviewsAlexandru Croitor2019-11-1316-38/+244
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia95c89cde7faf5d3edb69cc8969bda2becd7b51d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>