summaryrefslogtreecommitdiff
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Update binary compatibility files for Qt 5.9.0 for QtToolsMilla Pohjanheimo2017-06-303-0/+59591
| | | | | | | Binary compatibility files updated for Qt 5.9.0. Change-Id: Ie409f6cd8fed076cffbc16b6dc61f32b7e7828c0 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* Revert "tst_windeployqt: Add --no-angle"Friedemann Kleint2017-06-091-2/+1
| | | | | | | | | | Re-enable testing ANGLE deployment. This reverts commit eeb08ff6408f803ae0eeb70bf3aa075157f12cb2. Task-number: QTBUG-56992 Change-Id: I019616a8858685b25c8e02f4f1081487ebb9f615 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Fix licensingJani Heikkinen2017-05-035-54/+39
| | | | | | | | | | | | - Remove unused license files - Switch old LGPLv21 license headers with GPL-EXCEPT one - Switch old LGPL3 license headers with LGPL one Task-number: QTBUG-57147 Change-Id: I36a5b5b823cede544f43ac8349b5db27f8df6abc Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-03-272-0/+14
|\ | | | | | | Change-Id: I73fad6fed560b8df8382cb9c17fe295a74ef3553
| * Fix lupdate to handle \u escapesEdward Welbourne2017-03-092-0/+14
| | | | | | | | | | | | | | | | | | | | It treated \u as u, which isn't correct. Instead, read the number following and convert, via QChar, to UTF-8 encoding in the byte array (that'll later be .fromUtf8()ed). Added a simple test-case. Task-number: QTBUG-35164 Change-Id: Ib23cc5e5fb98e6cb8715b4018545e40a40e271d0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | windeployqt: Compile with QT_NO_FOREACHFriedemann Kleint2017-01-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Remove usage of foreach, replace by C++ 11 range based for. On this occasion, change all loops over QDir::entryList() to use QDir::entryInfoList() which is more efficient and makes path construction easier. Change-Id: I18b83fccdf497ca6b0466cacde876c795299b566 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-12-1218-14/+212
|\ \ | |/ | | | | Change-Id: I5431f85d563b6949f94d2008fc8dcf840b5c3397
| * qtattributionscanner: Support optional QtParts propertyKai Koehne2016-11-284-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We'd like to differentiate between code that ends up in the Qt libraries or plugins, or code that only is added to examples, tests, or (host) tools. This can now be specified with the JSON property 'QtParts'. If 'QtParts' does not contain 'libs', the page will not show up in the list of attributions generated by module with e.g. \generatelist{groupsbymodule attributions-qtcore} nor in the global list generated by \generatelist annotatedattributions Instead, third party code in examples or tests can now be documented separately using e.g. \generatelist{groupsbymodule attributions-examples} and \annotatedlist attributions-examples Change-Id: Iba72f76b63e4435af54a61b7b4a2cf4617746ba6 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| * Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-0814-14/+201
| |\ | | | | | | | | | Change-Id: Ib403ca6ac5edf4c75e7fbdcd467601bdfe348e6d
| | * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-11-0414-14/+201
| | |\ | | | | | | | | | | | | Change-Id: I4ee208f69bed72c480c636cb18f22fd88c02d1e5
| | | * lupdate: Add qrc resource file supportTakumi ASAKI2016-10-2511-0/+185
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lupdate parses qrc files specified by the RESOURCES qmake variable or by command line options, and adds files in them as source files. [ChangeLog][lupdate] Added qrc resource file support Task-number: QTBUG-53206 Change-Id: Id7f952487ab11e062db9c5a419fb2ee3c4716740 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| | | * fix test execution in dirs with spacesOswald Buddenhagen2016-10-252-6/+6
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib99cf27f50f32eb23d278f5b9a9c279d10da4ece Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| | | * deduplicate test command launching a bitOswald Buddenhagen2016-10-252-13/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | pre-calculate the lrelease/lconvert path once. Change-Id: Ia1603db955ef08e61d123393f6e69c4653d8b6a9 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| * | | attributionscanner: Allow to specify multiple filesv5.8.0-beta1Kai Koehne2016-10-273-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So far 'Path' was used to specify a whole directory, or a single file. This introduces a separate 'Files' property, so that one can document that e.g. two specific files in a directory contain third party code. 'Files' should be relative to 'Path'. Change-Id: If4213d9a1b1ca706c49ed761027c6af86fbdc02a Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | | | tst_windeployqt: Add --no-angleFriedemann Kleint2016-11-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deploy without ANGLE until renaming has settled. Task-number: QTBUG-56992 Change-Id: I94306869ac67849cc9068ec7ea5939866bdb6cdd Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | | | tst_windeployqt: Output standard error and output on failureFriedemann Kleint2016-11-031-9/+19
|/ / / | | | | | | | | | | | | Change-Id: Ifd332a50154b9f688713faf4a65c778456e7abbf Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-09-196-0/+116662
|\ \ \ | |/ / | | | | | | Change-Id: I53396b5740072c28c36569e4ed9ec247b30c845e
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-09-173-0/+57683
| |\ \ | | |/ | | | | | | Change-Id: Ie87b293b1ed9d509a70ee5f8677c05365db37aa5
| | * BC data files for QtTools for Qt 5.6Milla Pohjanheimo2016-09-053-0/+57683
| | | | | | | | | | | | | | | | | | | | | | | | Added binary compatibility data files for tst_bic test Change-Id: Ibe71e2ae4da3c886bc3871f5fa495664fb76a880 Reviewed-by: Sergio Ahumada <sahumada@texla.cl> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * | BC data files for QtTools (5.7)Milla Pohjanheimo2016-09-133-0/+58979
| | | | | | | | | | | | | | | | | | | | | | | | | | | Added the generated data files for the binary compatibility tests for QtTools for Qt 5.7. Change-Id: I5703e2780daf2ad406013f30069e6f79c45db85f Reviewed-by: Sergio Ahumada <sahumada@texla.cl> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-09182-29764/+18
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf tests/manual/manual.pro Change-Id: Ia39b2c337e158a0b511fc1bcbb96625e284ffa58
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-022-0/+18
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/designer/src/designer/qdesigner.cpp One side changed Q_OS_MAC -> Q_OS_MACOS; the other changed it to Q_OS_OSX and combined with Q_OS_WIN. Kept the latter. tests/auto/linguist/lupdate/testdata/good/parsecpp/project.ts.result One side added some XML next to where another made a local change. Change-Id: I812b55fbaccc85baa9856aedf90f9258428dfcab
| | * Linguist: Fix lupdate includes without spacesMarko Kangas2016-06-292-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed lupdate to support includes without spaces before filename. Task-number: QTBUG-34092 Change-Id: If6b8d2b6941c9ea0084900ba14c81e261c0600cb Reviewed-by: Jan Kundrát <jkt@kde.org> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * | Remove manual uiloader testFriedemann Kleint2016-07-29180-29765/+0
| | | | | | | | | | | | | | | | | | | | | | | | Delete the old manual test which required a big setup involving network servers and compared screenshots. Change-Id: I2f98b2e741d9be8a0bd1ed553910ee7f649356ad Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | | qtattributionsscanner: Support setting & filtering qdoc moduleKai Koehne2016-08-0810-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | This is needed e.g. for qtbase, where there are multiple help projects. Change-Id: Ia31ac4818ad6780a301fa6f7371a3f33ee21df48 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | | qtattributionsscanner: Use new qdoc attribution attributeKai Koehne2016-08-083-3/+17
| | | | | | | | | | | | | | | Change-Id: Ibb720811808053b76a794b3333cb2a698b961281 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | | Add qtattributionsscanner toolKai Koehne2016-08-0517-1/+963
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qtattributionsscanner generates qdoc documentation about third party licenses in Qt sources. It scans recursively for qt_attribution.json files in the directory given on the command line. The qt_attribution.json file format is also documented under http://wiki.qt.io/Qt_attribution.json Task-number: QTBUG-55139 Change-Id: Ie8d9115beb9457c9f60a79e11c1c13dd19184d1c Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-06-30186-2781/+2117
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/assistant/qcollectiongenerator/main.cpp src/qtestlib/wince/cetcpsync/main.cpp src/qtestlib/wince/cetcpsync/qtcesterconnection.cpp src/qtestlib/wince/cetcpsync/qtcesterconnection.h src/qtestlib/wince/cetcpsync/remoteconnection.cpp src/qtestlib/wince/cetcpsync/remoteconnection.h src/qtestlib/wince/cetcpsyncserver/commands.cpp src/qtestlib/wince/cetcpsyncserver/commands.h src/qtestlib/wince/cetcpsyncserver/connectionmanager.cpp src/qtestlib/wince/cetcpsyncserver/connectionmanager.h src/qtestlib/wince/cetcpsyncserver/main.cpp src/qtestlib/wince/cetcpsyncserver/transfer_global.h src/qtestlib/wince/cetest/activesyncconnection.cpp src/qtestlib/wince/cetest/activesyncconnection.h src/qtestlib/wince/cetest/cetcpsyncconnection.cpp src/qtestlib/wince/cetest/cetcpsyncconnection.h src/qtestlib/wince/cetest/deployment.cpp src/qtestlib/wince/cetest/deployment.h src/qtestlib/wince/cetest/main.cpp src/qtestlib/wince/cetest/remoteconnection.cpp src/qtestlib/wince/cetest/remoteconnection.h src/qtestlib/wince/remotelib/commands.cpp src/qtestlib/wince/remotelib/commands.h Change-Id: Ia1b311710f7e8009ca1697faae3ae5e37e80ecc3
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-291-0/+33
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: src/assistant/assistant/doc/src/assistant-manual.qdoc Change-Id: I136caf5f26eff4d1c2574459b8dff9937c2c372d
| | * Verify that two runs of QHelpGenerator creates same outputSune Vuorela2016-06-141-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | Part of ensuring reproducible Qt. No actual code changes here, just a test ensuring things does not break in the future. Change-Id: Ib957aefb4eb80fb949f0094403930769e7e47900 Reviewed-by: David Faure <david.faure@kdab.com> Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>
| * | Updated license headers and license testsAntti Kokko2016-06-10186-2781/+2084
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From Qt 5.7 -> tools & applications are licensed under GPL v3 with some exceptions, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new GPL-EXCEPT header instead of LGPL21 one (in those files which will be under GPL 3 with exceptions) License header tests also updated to match current headers. Change-Id: Ia6bdacaa3c5bbc9d31334e1a0cabfe502a484dc4 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-05-273-0/+214
|\ \ \ | |/ / | | | | | | Change-Id: I3994e80ec7366f1303d23214315013b79ca2acf3
| * | Merge remote-tracking branch 'origin/5.6.1' into 5.7.0v5.7.0-rc1Liang Qi2016-05-272-0/+25
| |\ \ | | |/ | | | | | | Change-Id: I776e0503279ee3ca7726459c97056a92dcfbdaa4
| | * lupdate: Fix parsing of class template specializationsKai Pastor2016-05-272-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4ea581c95ae9704b250591c5d4d9b0517f5b62f2 introduced a bug where class template specialization would lead to contexts not being properly cleaned up on '}'. The occurrence of class template specializations lead to a massive slowdown in parsing following includes because they were treated as direct (in-namespace) and parsed more often than normally needed. Unfortunately the bug was not discovered early by the auto tests, but eventually the slowdown appeared in CI when merging to dev. This change adds a test for class template specializations. It would discover the cause (broken context) which triggers the slowdown but doesn't depend on includes. Task-number: QTBUG-53644 Change-Id: I94cce58702b53dfb5e0f9c92585222dd3f938593 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-193-0/+189
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I5fde87a1ac22e933c926e0d86996791a38d92c4e
| | * lupdate: Explicitly handle C++ member initializer listsKai Pastor2016-04-283-0/+189
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes the cpp parser explicitly deal with parens and braces in member initializer lists of constructors. It fixes problems with C++11 syntax like list-initialization and lambdas. It adds auto tests for tr() calls in initialization expressions. The combination of parens in base class template parameters with list initialization (braces) remains unsupported. Task-number: QTBUG-34128 Task-number: QTBUG-42166 Change-Id: Id4ac0a011fcda8d2b72a15348a1b96fdd492ab32 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-05-132-0/+23
|\ \ \ | |/ / | | | | | | Change-Id: Idff3a769724c52de3806697df5b2850cf004d203
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Simon Hausmann2016-04-252-0/+23
| |\ \ | | |/ | | | | | | Change-Id: I6b72d14a0e6b6523a15e286422bdb15499f7f111
| | * lupdate: Treat NULL and Q_NULLPTR like literal 0Kai Pastor2016-04-122-0/+23
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-34265 Change-Id: I2b69d7c6bc0514977cee9dd50a0c861e46dc589b Reviewed-by: Rolf Eike Beer <eb@emlix.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.7' into devSimon Hausmann2016-04-063-4/+46
|\ \ \ | |/ / | | | | | | Change-Id: I6cc44e077f16ecfbe7153048539e8a5ce0c17f1e
| * | Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7Simon Hausmann2016-04-062-0/+46
| |\ \
| | * \ Merge remote-tracking branch 'origin/5.6' into 5.7Simon Hausmann2016-04-062-0/+46
| | |\ \ | | | |/ | | | | | | | | Change-Id: I06a1d65d1bcb0cdb0ae6e00e57283333aafbb673
| | | * lupdate: Treat nullptr like literal 0Kai Pastor2016-03-152-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lupdate parses C++ just for extracting strings which are to be translated. For this purpose, a nullptr is equivalent to a literal 0. Task-number: QTBUG-47467 Change-Id: Iecf73ef25802e4d9b99abff156546e6caed88b3e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * | | purge symbian vestigesOswald Buddenhagen2016-04-061-4/+0
| |/ / | | | | | | | | | | | | Change-Id: I53373e8d6ef2c2f7b46945f6654b019d32d38a2c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | | Remove Windows CE.Friedemann Kleint2016-03-103-34/+4
|/ / | | | | | | | | | | | | | | | | | | Remove #ifdef sections for Q_OS_WINCE, wince .pro file clauses and the CE-specific test library. Task-number: QTBUG-51673 Change-Id: I9dbcca9c9b6febe67a7c5b5d2cee0b1ab1f302f7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-01-212-0/+148
|\ \ | |/ | | | | Change-Id: Ie5e9e73a136892cbd02498cca7cd782b50187ddf
| * lupdate: Handle translation comments in ternary expressionsMichael Hanselmann2016-01-152-0/+90
| | | | | | | | | | | | | | | | | | | | | | When the condition in a ternary operator expression was anything more than a single identifier translation comments were not recognized for translations within the values. Re-enabling translator comment detection after the question mark fixes that. Task-number: QTBUG-48776 Change-Id: I83bb9efaab42c52fc05a39094060eb0a1fb76d94 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * lupdate: Support for C++11's "final" identifierMichael Hanselmann2016-01-052-0/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | C++11 introduced the "final" identifier which may appear immediately after the name in a class definition to specify that the class cannot be derived from. lupdate collects strings for translation and did not understand "final". Instead it would use "final" as the name of the class as there may be attributes before the class name and the last token before the colon character is used. [ChangeLog][lupdate] The C++11 identifier "final" is now skipped when determining the name of a class. Task-number: QTBUG-42735 Change-Id: I2adee9a188645622fc6916158ba2b48dde921383 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Increase coverage of test_create_translation testKevin Funk2016-01-051-1/+1
| | | | | | | | | | | | | | Also test OPTIONS parameter of create_translation function Change-Id: I478c91736308c69501c60b892512aa45965fc818 Reviewed-by: Stephen Kelly <steveire@gmail.com>
* | Split up test_translation_macrosKevin Funk2015-12-289-6/+133
| | | | | | | | | | | | | | | | | | | | | | Split up into two individual tests: * test_add_translation_macro * test_create_translation_macro Required for upcoming extension of qt5_add_translation macro Change-Id: Iaf18aed493119bdbefec3790a7a29bb42c6925b7 Reviewed-by: Stephen Kelly <steveire@gmail.com>
View Lorry Controller Status