lp:~neon/qt/qttools

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

586. By Frederik Gladhorn <email address hidden> on 2015-03-03

Merge remote-tracking branch 'origin/5.4' into 5.5

Change-Id: Ie55561b4d56f23200eda2cc9d2152ae719f2a906

585. By Friedemann Kleint <email address hidden> on 2015-02-26

Assistant/helpbrowsersupport.cpp: Remove hostile character.

Fix qdoc-warning:
qttools/src/assistant/assistant/helpbrowsersupport.cpp:1: warning: Hostile character 0xbf in C++ source

Change-Id: If565d8af3502504c5e8b9e2ca70fc439a758e9e0
Reviewed-by: Christian Kandeler <email address hidden>

584. By Friedemann Kleint <email address hidden> on 2015-02-26

Change copyright in version dialogs to 'The Qt Company Ltd.'

Change-Id: I7f1d079dc3714685c4d34fad6c237798ca747b1c
Reviewed-by: Kai Koehne <email address hidden>
Reviewed-by: Jani Heikkinen <email address hidden>

583. By Friedemann Kleint <email address hidden> on 2015-02-24

windeployqt: Turn off debug/release matching for WebEngine plugins.

Its plugins (ffmpegsumo.dll) are always wrongly detected as debug
builds.

Change-Id: I17ad353a58c90368ab2bc96704016910071f3950
Task-number: QTBUG-44331
Reviewed-by: Michael Brüning <email address hidden>
Reviewed-by: Kai Koehne <email address hidden>

582. By Oswald Buddenhagen <email address hidden> on 2015-02-23

Merge dev into 5.5

Change-Id: I3bf7a2f27c34ac77198aabcb57f3ad7df5970649

581. By Frederik Gladhorn <email address hidden> on 2015-02-22

Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5

580. By Friedemann Kleint <email address hidden> on 2015-02-20

windeployqt: Fix g++ warning about unhandled enumeration value WinCE.

Change-Id: I2bd95f058c9c03b45ccf43a6f9c6736fed036286
Reviewed-by: Joerg Bornemann <email address hidden>
Reviewed-by: Andreas Holzammer <email address hidden>

579. By Sune Vuorela on 2015-02-18

Change creation date to a fixed date

Encoding the dates makes reproducing the output impossible, and doesn't
really have much gain. It most of the time not relevant when something
was built, but more 'what was built' and 'with what tools was it built'

In this case, the creation date isn't read by any thing, so it is likely
just filler data.

Keep the key anyways to not break any third party readers of the file
and set a fixed date, in this case the same date as used for a fixed
date in QtCore's QLibraryInfo::buildDate function at noon.

Change-Id: I560e43dfce538e2f25c3cf51482b946a7cfa179e
Reviewed-by: Christian Kandeler <email address hidden>

578. By Antti Kokko <email address hidden> on 2015-02-14

Update copyright headers

Qt copyrights are now in The Qt Company, so we could update the source
code headers accordingly. In the same go we should also fix the links to
point to qt.io.

Change-Id: I7f14f408e04c5c4f73a913fae153adcffbebe38f
Reviewed-by: Oswald Buddenhagen <email address hidden>
Reviewed-by: Jani Heikkinen <email address hidden>

577. By Eskil Abrahamsen Blomfeldt on 2015-02-10

androiddeployqt: Always include platform plugin dependencies

Qt DBus recently became a dependency for the platform plugin,
causing applications to crash on startup when this is missing.
Instead of special casing the GUI dependency, we always add all
dependencies of the platform plugin.

Change-Id: I59d71531f60874ce436af1840656974d58c14661
Task-number: QTBUG-44182
Reviewed-by: Shawn Rutledge <email address hidden>
Reviewed-by: Christian Stromme <email address hidden>