feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Squish: Update Creator's sources to v4.7.0

Browse Source 
Task-number: QTCREATORBUG-20344
Change-Id: I7664f2f1b9f9412b9564f192319f9ed832dc142a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Robert Loehning
2018-07-24 11:49:01 +02:00
parent 5a3a432396
commit 24f33dc482
4 changed files with 7556 additions and 1910 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/system/README
View File

@@ -53,7 +53,7 @@ Fourth - you'll have to provide some additional repositories (and for the hookin
These additional repositories are located inside ~/squish-data or C:\Users\<user>\squish-data (depending on the OS you're on). These additional repositories are located inside ~/squish-data or C:\Users\<user>\squish-data (depending on the OS you're on).
You can also just provide them inside a different folder and specify the folder with the environment variable SYSTEST_SRCPATH. You can also just provide them inside a different folder and specify the folder with the environment variable SYSTEST_SRCPATH.
This folder must contain the following: This folder must contain the following:
* a QtCreator repository (or source copy) of tag v4.4.1 named 'creator' including the submodule src/shared/qbs * a QtCreator repository (or source copy) of tag v4.7.0 named 'creator' including the submodule src/shared/qbs
* a subfolder called 'creator-test-data' * a subfolder called 'creator-test-data'
* a speedcrunch 0.11 repository (or source copy) inside 'creator-test-data' named 'speedcrunch' * a speedcrunch 0.11 repository (or source copy) inside 'creator-test-data' named 'speedcrunch'
* additional Squish versions for hooking into subprocesses inside different folders inside 'creator-test-data' following the information below * additional Squish versions for hooking into subprocesses inside different folders inside 'creator-test-data' following the information below

4429
tests/system/suite_general/tst_opencreator_qbs/testdata/projecttree_creator.tsv vendored
View File

File diff suppressed because it is too large Load Diff

2
tests/system/suite_general/tst_openqt_creator/test.py
View File

@@ -66,7 +66,7 @@ def main():
generalMessages = str(waitForObject(":Qt Creator_Core::OutputWindow").plainText) generalMessages = str(waitForObject(":Qt Creator_Core::OutputWindow").plainText)
test.compare(generalMessages.count("Project MESSAGE: Cannot build Qt Creator with Qt version 5.6.1."), 1, test.compare(generalMessages.count("Project MESSAGE: Cannot build Qt Creator with Qt version 5.6.1."), 1,
"Warning about outdated Qt shown?") "Warning about outdated Qt shown?")
test.compare(generalMessages.count("Project ERROR: Use at least Qt 5.6.2."), 1, test.compare(generalMessages.count("Project ERROR: Use at least Qt 5.9.0."), 1,
"Minimum Qt version shown (once when parsing with default kit, once with selected)?") "Minimum Qt version shown (once when parsing with default kit, once with selected)?")
# Verify that qmljs.g is in the project even when we don't know where (QTCREATORBUG-17609) # Verify that qmljs.g is in the project even when we don't know where (QTCREATORBUG-17609)

5033
tests/system/suite_general/tst_openqt_creator/testdata/projecttree_creator.tsv vendored
View File

File diff suppressed because it is too large Load Diff