Eike Ziller 74cdce071f Merge remote-tracking branch 'origin/3.6' ...

Conflicts:
	src/shared/qbs
	tests/manual/proparser/main.cpp

Change-Id: I13654bf10c14eb6b1d6805fe86b67ac73b2e4d75

2016-02-24 10:08:37 +01:00

..

shared/testdata/simpleQuickUI2

Update License according to agreement with Free Qt Foundation

2016-01-19 16:01:06 +00:00

tst_build_new_project

Update License according to agreement with Free Qt Foundation

2016-01-19 16:01:06 +00:00

tst_cli_output_console

Update License according to agreement with Free Qt Foundation

2016-01-19 16:01:06 +00:00

tst_debug_empty_main

Update License according to agreement with Free Qt Foundation

2016-01-19 16:01:06 +00:00

tst_qml_js_console

Merge remote-tracking branch 'origin/3.6'

2016-02-24 10:08:37 +01:00

tst_qml_locals

Update License according to agreement with Free Qt Foundation

2016-01-19 16:01:06 +00:00

tst_simple_analyze

Update License according to agreement with Free Qt Foundation

2016-01-19 16:01:06 +00:00

tst_simple_debug

Update License according to agreement with Free Qt Foundation

2016-01-19 16:01:06 +00:00

envvars

Squish: Add missing envvars files

2013-12-12 13:05:13 +01:00

suite.conf

Squish: Provide test for QmlJSConsole

2014-07-22 13:11:42 +02:00