lp://qastaging/~neon/qt/qtqa

Branch merges

This import branch has no branches proposed for merge into it.

No branches dependent on this one.

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

636. By Sergio Ahumada <email address hidden> on 2015-03-04

Rename Qt 5.4.1 -> 5.4.2 and Enginio 1.1.1 -> 1.1.2

Qt 5.4.1 and Qt Enginio 1.1.1 are already released

Change-Id: I7bd4c404c6b3e726c58389b869f6f57b8c00b6dc
Reviewed-by: Tony Sarajärvi <email address hidden>

635. By Tony Sarajärvi <email address hidden> on 2015-03-03

Update integrator confs to upload logs to qt.io

Change-Id: Ic80e44afc17c1cca35ee8de452c72806fcdd6a5b
Reviewed-by: Sergio Ahumada <email address hidden>
Reviewed-by: Frederik Gladhorn <email address hidden>

634. By Sergio Ahumada <email address hidden> on 2015-02-23

tst_bic: blacklist some more QOpenGLFunctions_*Backend classes

Change-Id: I957d9151fc7b1adbf2d5b48f5cf4d08c34633cac
Reviewed-by: Sean Harmer <email address hidden>

633. By Sergio Ahumada <email address hidden> on 2015-02-22

tst_bic: blacklist some QOpenGLFunctions_*Backend

Change-Id: I408d16b01f08ca86f1335c965b6d5fcaf02bd9d0
Reviewed-by: Sean Harmer <email address hidden>

632. By Sergio Ahumada <email address hidden> on 2015-02-22

tst_bic: blacklist QLoggingCategory::AtomicBools

Change-Id: I5b688b1089f68135a9c9ebfae526b370d6a9ead7
Reviewed-by: Sergio Ahumada <email address hidden>

631. By Sergio Ahumada <email address hidden> on 2015-02-19

Fix bug in tst_licenses.pl when the license type does not exist

If the $licenseType does not exist (e.g. the old $QT_BEGIN_LICENSE:LGPL$
declaration is used) then the array @{$licenseTexts{$licenseType}} that
should contain the license text (from qtbase/header.*) is undefined because,
e.g., qtbase/header.LGPL does not exist, making the license script to fail
producing an error like:

  Can't use an undefined value as an ARRAY reference at /work/build/_qtqa_latest/tests/prebuild/license/tst_licenses.pl line 364.
  # Looks like your test exited with 255 before it could output anything.
  /work/build/_qtqa_latest/tests/prebuild/license/tst_licenses.pl ..
  Dubious, test returned 255 (wstat 65280, 0xff00)
  Failed 3/3 subtests

Change the validation to check if the array is undefined and replacing it
with an empty array if so, which should produce a more readable message
instead of making the script fail, something like:

 ...
 not ok 45 - No reference text for license type LGPL in src/doc/src/qtcanvas3d.qdoc, line 8
 # Failed test 'No reference text for license type LGPL in src/doc/src/qtcanvas3d.qdoc, line 8'
 # at ../qtqa/tests/prebuild/license/tst_licenses.pl line 365.
 ...

Change-Id: Iee0cb8783ee6e38d5a30b1c417543e9fa1723561
Reviewed-by: Oswald Buddenhagen <email address hidden>

630. By Alex Blasche on 2015-02-19

Revert "Temporarily remove QtLocation from license check"

The exception is no longer needed.

This reverts commit bf134cc0afc609c27a6f865bb860a1b480110a7c.

Change-Id: I694de6b29639e02ef4bc803965180cb6a7b548e9
Reviewed-by: Sergio Ahumada <email address hidden>

629. By Alex Blasche on 2015-02-18

Temporarily remove QtLocation from license check

Will be readded before the 5.5 alpha release

Change-Id: I84f6bc098fb769f667e981283624912c719592a2
Reviewed-by: Tony Sarajärvi <email address hidden>
Reviewed-by: Sergio Ahumada <email address hidden>

628. By Sergio Ahumada <email address hidden> on 2015-02-17

Revert "Mark tst_license as insignificant"

most repositories are already updated, let's reduce the
risk of files being merged with the wrong license header
by reverting this temporary change

This reverts commit 6076203fd3784d871b7b9b3e2d804660d59fcb2d.

Change-Id: Ifbac88f55384763cb34fd959a63981158fe17b53
Reviewed-by: Jani Heikkinen <email address hidden>
Reviewed-by: Tony Sarajärvi <email address hidden>

627. By Sergio Ahumada <email address hidden> on 2015-02-17

Fix license headers

Change-Id: Ie44d503a04496f441af8b0c63e6c80a3acc575d6
Reviewed-by: Heikki Halmet <email address hidden>