Merge remote-tracking branch 'origin/3.1'
Conflicts: src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp Change-Id: Icce6e8dd9b3afd9a0fe836e9babfb7a17cee9c4d
No related branches found
No related tags found
Showing
- tests/system/shared/utils.py 19 additions, 8 deletionstests/system/shared/utils.py
- tests/system/shared/workarounds.py 70 additions, 1 deletiontests/system/shared/workarounds.py
- tests/system/suite_HELP/tst_HELP02/test.py 38 additions, 5 deletionstests/system/suite_HELP/tst_HELP02/test.py
- tests/system/suite_QMLS/shared/qmls.py 1 addition, 1 deletiontests/system/suite_QMLS/shared/qmls.py
- tests/system/suite_QMLS/tst_QMLS04/test.py 20 additions, 15 deletionstests/system/suite_QMLS/tst_QMLS04/test.py
- tests/system/suite_SCOM/tst_SCOM02/test.py 1 addition, 1 deletiontests/system/suite_SCOM/tst_SCOM02/test.py
- tests/system/suite_debugger/tst_simple_debug/test.py 1 addition, 1 deletiontests/system/suite_debugger/tst_simple_debug/test.py
- tests/system/suite_editors/tst_qml_indent/test.py 1 addition, 1 deletiontests/system/suite_editors/tst_qml_indent/test.py
- tests/system/suite_general/tst_default_settings/test.py 9 additions, 12 deletionstests/system/suite_general/tst_default_settings/test.py
- tests/system/suite_qtquick/tst_qml_outline/test.py 2 additions, 0 deletionstests/system/suite_qtquick/tst_qml_outline/test.py
- tests/system/suite_tools/tst_git_local/test.py 1 addition, 2 deletionstests/system/suite_tools/tst_git_local/test.py
Loading
Please register or sign in to comment